Changeset 105

Timestamp:

06/15/07 16:19:40 (17 years ago)

Author:

kdeugau

Message:

/trunk

Process %if statements in %description sections too. It has its uses...

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -540 +540 @@
     } # %if/%else/%endif
 
-# description.  not going to parse for %ifs in it.
+# now we pick out the sections and set "state" to parse that section.  Fugly but I can't see a better way.  >:(
+
     if (/^\%description(?:\s+(?:-n\s+)?(.+))?/) {
+      $stage = 'desc';
       $subname = "main";
       if ($1) {       # Magic to add entries to the right package
@@ -547 +549 @@
         if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
       }
-      while (<SPECFILE>) {
-        next if /^#/;    # Messy.  Should be possible to do better.  :/
-        redo LINE if /^\%[a-z]/;
-        $pkgdata{$subname}{desc} .= " $_";
-      }
+      next LINE;
     } # %description
-
-# now we pick out the sections and set "state" to parse that section.  Fugly but I can't see a better way.  >:(
 
     if (/^\%package\s+(?:-n\s+)?(.+)/) {
@@ -627 +623 @@
 
 # now we handle individual lines from the various sections
+
+    if ($stage eq 'desc') {
+      $pkgdata{$subname}{desc} .= " $_";
+    } # description
 
     if ($stage eq 'package') {