Changeset 101

Timestamp:

05/16/07 16:30:47 (17 years ago)

Author:

kdeugau

Message:

/trunk

Clean up end-of-section detection: Check for ^{%[a-z] rather than just} %
to avoid tripping on macros at the beginning of lines in a section.

File:

• trunk/debbuild (modified) (6 diffs)

trunk/debbuild

@@ -501 +501 @@
         while (<SPECFILE>) {
           next if /^#/;    # Messy.  Should be possible to do better.  :/
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
           $pkgdata{$subname}{desc} .= " $_";
         }
@@ -517 +517 @@
         $pkgdata{$subname}{arch} = $buildarch;  # Since it's likely subpackages will NOT have a BuildArch line...
         while (<SPECFILE>) {
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
           if (my ($dname,$dvalue) = (/^(Summary|Group|Version|Requires|Provides|BuildArch(?:itecture)?):\s+(.+)$/i)) {
             $dname =~ tr/[A-Z]/[a-z]/;
@@ -611 +611 @@
       if (/^\%clean/) {
         while (<SPECFILE>) {
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
           $cleanscript .= $_;
         }
@@ -626 +626 @@
         }
         while (<SPECFILE>) {
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
           $pkgdata{$pkgname}{$scriptlet} .= $_;
         }
@@ -712 +712 @@
 
           # ... unknown or "next section" % directives ...
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
 
           # ... and "normal" files
@@ -722 +722 @@
         $pkgdata{main}{changelog} = '';
         while (<SPECFILE>) {
-          redo LINE if /^\%/;
+          redo LINE if /^\%[a-z]/;
           $pkgdata{main}{changelog} .= $_;
         }