Changeset 537 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Sep 10, 2008, 11:47:49 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix #31: pb now preserves by default original tar files got by http or ftp to allow for checksum consistency.

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -496 +496 @@
         pb_log(2,"def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n");
 
-        # Exporting from CMS
-        pb_cms_export($uri,"$ENV{'PBDIR'}/$dir",$dest);
+        # Exporting content from CMS
+        my $preserve = pb_cms_export($uri,"$ENV{'PBDIR'}/$dir",$dest);
 
         # Generated fake content for test versions to speed up stuff
@@ -679 +679 @@
         # Archive dest dir
         chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
-        # Possibility to look at PBSRC to guess more the filename
-        pb_system("tar cfz $pbpkg-$pbver.tar.gz --exclude=$pbpkg-$pbver/pbconf $pbpkg-$pbver","Creating $pbpkg tar files compressed");
+        if (defined $preserve) {
+            # In that case we want to preserve the original tar file for checksum purposes
+            # The one created is btw equivalent in that case to this one
+            # Maybe check basename of both to be sure they are the same ?
+            pb_log(0,"Preserving original tar file ");
+            move("$preserve","$pbpkg-$pbver.tar.gz");
+        } else {
+            # Possibility to look at PBSRC to guess more the filename
+            pb_system("tar cfz $pbpkg-$pbver.tar.gz --exclude=$pbpkg-$pbver/pbconf $pbpkg-$pbver","Creating $pbpkg tar files compressed");
+        }
         pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
         pb_system("tar cfz $pbpkg-$pbver.pbconf.tar.gz $pbpkg-$pbver/pbconf","Creating pbconf tar files compressed");