Changeset 2202 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Mar 10, 2017, 4:23:34 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix a bug with git+http when doing export, where the worng block was executed first due to the way checks are made ( ^{vs no} )

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -8 +8 @@
 # $Id$
 #
-# Copyright B. Cornec 2007-2016
+# Copyright B. Cornec 2007-today
 # Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
 # Provided under the GPL v2
@@ -117 +117 @@
 } elsif ($scheme eq "dir") {
     pb_system("cp -r $path $destdir","Copying $uri from DIR to $destdir ");
-} elsif (($scheme =~ /http/) || ($scheme eq "ftp")) {
-    my $f = basename($path);
-    unlink "$ENV{'PBTMP'}/$f";
-    pb_system("$vcscmd $ENV{'PBTMP'}/$f $uri","Downloading $uri with $vcscmd to $ENV{'PBTMP'}/$f\n");
-    # We want to preserve the original tar file
-    pb_vcs_export("file://$ENV{'PBTMP'}/$f",$source,$destdir);
-    return("$ENV{'PBTMP'}/$f");
 } elsif ($scheme =~ /^file/) {
     eval
@@ -242 +235 @@
     }
     pb_system("cd $dir ; $vcscmd -d $account\@$host:$path export $cvsopt -d $base $tmp1","Exporting $tmp1 from $source under CVS to $destdir ");
+} elsif (($scheme =~ /http/) || ($scheme eq "ftp")) {
+    my $f = basename($path);
+    unlink "$ENV{'PBTMP'}/$f";
+    pb_system("$vcscmd $ENV{'PBTMP'}/$f $uri","Downloading $uri with $vcscmd to $ENV{'PBTMP'}/$f\n");
+    # We want to preserve the original tar file
+    pb_vcs_export("file://$ENV{'PBTMP'}/$f",$source,$destdir);
+    return("$ENV{'PBTMP'}/$f");
 } else {
     confess "cms $scheme unknown";