Changeset 537 in ProjectBuilder for devel/pb/lib/ProjectBuilder/CMS.pm

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/lib/ProjectBuilder/CMS.pm (modified) (4 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -112 +112 @@
 The second parameter is the directory in which it is locally exposed (result of a checkout). If undef, then use the original CMS content.
 The third parameter is the directory where we want to deliver it (result of export).
+It returns the original tar file if we need to preserve it and undef if we use the produced one.
 
 =cut
@@ -150 +151 @@
         die "Unable to download $uri.\nNo wget/curl available, please install one of those";
     }
+    # We want to preserve the original tar file
     pb_cms_export("file://$ENV{'PBTMP'}/$f",$source,$destdir);
+    return("$ENV{'PBTMP'}/$f");
 } elsif ($scheme eq "file") {
     use File::MimeInfo; 
     my $mm = mimetype($path);
     pb_log(2,"mimetype: $mm\n");
-    pb_mkdir_p($destdir);
 
     if (defined $source) {
         # Check whether the file is well formed 
         # (containing already a directory with the project-version name)
+        #
+        # If it's not the case, we try to adapt, but distro needing 
+        # to verify the checksum will have issues (Fedora)
+        # Then upstream should be notified that they need to change their rules
         my ($pbwf) = pb_conf_get_if("pbwf");
         if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
@@ -165 +171 @@
         }
     }
+    pb_mkdir_p($destdir);
 
     if ($mm =~ /\/x-bzip-compressed-tar$/) {
@@ -210 +217 @@
     die "cms $scheme unknown";
 }
+return(undef);
 }