Changeset 49

Timestamp:

03/07/06 16:04:54 (18 years ago)

Author:

kdeugau

Message:

/trunk

Fix some broken behaviour with subpackages and -n

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -330 +330 @@
         my $subname = "main";
         if ($1) {
-          if (/-n/) { $subname = $1; } else { $subname = "$pkgdata{main}{name}-$1"; }
+          my $tmp = $1;
+          if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
         }
         while (<SPECFILE>) {
@@ -339 +340 @@
       }
       if (/^\%package\s+(?:-n\s+)?([a-zA-Z0-9_.-]+)/) {
-        my $subname;
-        if (/-n/) { $subname = $1; } else { $subname = "$pkgdata{main}{name}-$1"; }
+        my $subname = $1;
+        if (! /-n/) { $subname = "$pkgdata{main}{name}-$1"; }
         push @pkglist, $subname;
         $pkgdata{$subname}{name} = $subname;
@@ -459 +460 @@
         my $pkgname = 'main';
         if ($1) {       # Magic to add entries to the right list of files
-          if (/-n/) { $pkgname = $1; } else { $pkgname = "$pkgdata{main}{name}-$1"; }
+          my $tmp = $1;
+          if (/-n/) { $pkgname = $tmp; } else { $pkgname = "$pkgdata{main}{name}-$tmp"; }
         }