Changeset 205

Timestamp:

08/16/15 21:19:27 (9 years ago)

Author:

kdeugau

Message:

/trunk

Fix, extend, and clean up command line -t handling. Patch by Andreas
Scherer, modulo some offset shifts probably due to out of order patching:

In its current state of version 0.11.3, debbuild seems to support the
'-t' option with .tar.gz files exclusively. Unzipped .tar files and
bzipped/xzipped .tar files couldn't be properly handled by zcat, nor
could .zip files.

TODO: Try to reduce/merge the three large logic constructs for selecting
"some action" according to the file extension.

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -364 +364 @@
 
 if ($cmdopts{type} eq 't') {
-  # Need to unpack the tarball to find the spec file.  Sort of the inverse of -b above.
-  # Note that rpmbuild doesn't seem to support this operation from a .zip file, so neither will we.
-  # zcat $tarball |tar -t |grep .spec
-  # collect some info about the tarball
-  $specfile = "$topdir/BUILD/". qx { zcat $tarball |tar -t |grep -e '[\.]spec\$' };
+  # Need to unpack the $tarball to find the spec file.  Sort of the inverse of
+  # -b above.  Note that rpmbuild doesn't seem to support this operation from a
+  # .zip file properly, but we try our best.
+  $specfile = "$topdir/BUILD/";
+  if ($tarball =~ /\.zip$/) {
+    # .zip files are not really tarballs
+    $specfile .= qx { /usr/bin/zipinfo -1 $tarball '*.spec' };
+  } elsif ($tarball =~ /\.tar$/) {
+    # plain .tar files don't need to be uncompressed
+    $specfile .= qx { /bin/tar -tf $tarball --wildcards '*.spec' };
+  } else {
+    # select the decompressor according to the file extension
+    $specfile .=
+      ( $tarball =~ /\.(?:tgz|tar\.(?:gz|Z))$/ ?
+          qx { /bin/zcat $tarball | /bin/tar -t | grep -e '[\.]spec\$' } :
+        $tarball =~ /\.tar\.bz2$/ ?
+          qx { /bin/bzcat $tarball | /bin/tar -t | grep -e '[\.]spec\$' } :
+        $tarball =~ /\.tar\.xz$/ ?
+          qx { /usr/bin/xzcat $tarball | /bin/tar -t | grep -e '[\.]spec\$' } :
+        die("Can't handle unknown file type '$tarball'.") );
+  }
   chomp $specfile;
-  my ($fileonly, $dirname) = ($tarball =~ /(([a-zA-Z0-9._-]+)\.(?:tgz|tar\.(?:gz|bz2|xz|Z)))$/);
 
   $tarball = abs_path($tarball);
 ##fixme:  use macro expansions for the executables
-  my $unpackcmd = "cd $topdir/BUILD; ".
-        ( $tarball =~ /\.(?:tgz|tar\.(?:gz|Z))$/         ? "/bin/gzip"   : "" ).
-        ( $tarball =~ /\.tar\.bz2$/                      ? "/bin/bzip2"  : "" ).
-        ( $tarball =~ /\.tar\.xz$/                       ? "/usr/bin/xz" : "" ).
-        " -dc $tarball |/bin/tar -xf -";
+  my $unpackcmd = "cd $topdir/BUILD;\n";
+  if ($tarball =~ /\.zip$/) {
+    # .zip files are not really tarballs
+    $unpackcmd .= "/usr/bin/unzip -boa $tarball";
+  } elsif ($tarball =~ /\.tar$/) {
+    # plain .tar files don't need to be uncompressed
+    $unpackcmd .= "/bin/tar -xf $tarball";
+  } else {
+    # select the decompressor according to the file extension
+    $unpackcmd .=
+      ( $tarball =~ /\.(?:tgz|tar\.(?:gz|Z))$/ ? "/bin/gzip"   :
+        $tarball =~ /\.tar\.bz2$/              ? "/bin/bzip2"  :
+        $tarball =~ /\.tar\.xz$/               ? "/usr/bin/xz" :
+        die("Can't handle unknown file type '$tarball'.") ).
+      " -dc $tarball | /bin/tar -xf -";
+  }
 
   system "$unpackcmd";
-  system "cp $tarball $topdir/SOURCES/$fileonly";
-  system "cp $specfile $topdir/SPECS/";
+  system "cp -f $tarball $topdir/SOURCES/";
+  system "cp -f $specfile $topdir/SPECS/";
   parse_spec();
   die "Can't build $pkgdata{main}{name}:  build requirements not met.\n"
@@ -2045 +2071 @@
    if ($sourcedrop =~ /\.zip$/) {
       # .zip files are not really tarballs
-      $cmdstring .= "/usr/bin/unzip".
+      $cmdstring .= "/usr/bin/unzip -o".
          ( $quietunpack ? ' -qq ' : ' ' ).
          "'$topdir/SOURCES/$sourcedrop'";