Changeset 171 for trunk

Timestamp:

09/21/12 12:22:40 (12 years ago)

Author:

kdeugau

Message:

/trunk

Improve handling for Source: entries

• Internal housekeeping to prevent "Use of undefined...." errors
• Move filename-extraction into preamble parse; I have yet to see a live use case for always retrieving a file from a remote source.
• Don't try to add a null "main" source to the source package; this would add all files in %_topdir/SOURCES to the .sdeb whether they're really listed in a SourceNN: entry or not.

File:

• trunk/debbuild (modified) (4 diffs)

trunk/debbuild

@@ -179 +179 @@
 #       Requires, Provides
 # 10/31/2005 Maybe this should be flatter?  -kgd
-my %pkgdata;
+my %pkgdata = (main => {source => ''});
 my @pkglist = ('main'); #sigh
 # Files listing.  Embedding this in %pkgdata would be, um, messy.
@@ -671 +671 @@
     if (/^\%prep/) {
       $stage = 'prep';
-      # This really should be local-ish, but we need just the filename for the source
-      $pkgdata{main}{source} =~ s|.+/([^/]+)$|$1|;
       # Replace some core macros
       $pkgdata{main}{source} = expandmacros($pkgdata{main}{source},'gp');
@@ -951 +949 @@
       } elsif (/^source0?:\s*(.+)/i) {
         $pkgdata{main}{source} = $1;
+        # Do this here since we don't use any URL forms elsewhere (maybe some other time)
+        $pkgdata{main}{source} =~ s|^.+/([^/]+)$|$1|;
         # .tar, .tar.gz, .tar.bz2, .tgz
         die "Unknown tarball format $1\n" if $1 !~ /\.(?:tar(?:\.(?:gz|bz2))?|tgz)$/;
-      } elsif (/^source([0-9]+):\s*(.+)/i) {
-        $pkgdata{sources}{$1} = $2;
+      } elsif (my ($srcnum, $src) = (/^source([0-9]+):\s*(.+)/i)) {
+        $pkgdata{sources}{$srcnum} = $src;
+        # Do this here since we don't use any URL forms elsewhere (maybe some other time)
+        $pkgdata{sources}{$srcnum} =~ s|^.+/([^/]+)$|$1|;
       } elsif (/^patch([^:]+):\s*(.+)$/i) {
         my $patchname = "patch$1";
@@ -1398 +1400 @@
   $paxcmd = "cd $topdir; pax -w ";
 
-# tweak source entry into usable form.  Need it locally somewhere along the line.
-  (my $pkgsrc = $pkgdata{main}{source}) =~ s|.+/([^/]+)$|$1|;
-  $paxcmd .= "SOURCES/$pkgsrc ";
+  # some packages may not have a "main" source.
+  $paxcmd .= "SOURCES/$pkgdata{main}{source} " if $pkgdata{main}{source};
 
   # create file list:  Source[nn], Patch[nn]