Changeset 781 in ProjectBuilder

Timestamp:

May 18, 2009, 8:02:23 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3085@localhost: bruno | 2009-05-17 20:47:58 +0200

• Fix export function for SVK zhen dealing with files instead of dirs

File:

• devel/pb/lib/ProjectBuilder/CMS.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -164 +164 @@
     }
 } elsif ($scheme eq "svk") {
+    my $src = $source;
     if (defined $source) {
         if (-d $source) {
@@ -169 +170 @@
         } else {
             $tmp = "$destdir/".basename($source);
+            $src = dirname($source);
         }
         $source = pb_cms_mod_http($source,"svk");
@@ -174 +176 @@
         # pb_system("$vcscmd export $path $tmp","Exporting $path from $scheme to $tmp ");
         pb_log(4,"$uri,$source,$destdir,$scheme, $account, $host, $port, $path,$tmp");
-        pb_system("mkdir -p $tmp ; cd $tmp; tar -cf - -C $source . | tar xf -","Exporting $path from $scheme to $tmp ");
+        if (-d $source) {
+            pb_system("mkdir -p $tmp ; cd $tmp; tar -cf - -C $source . | tar xf -","Exporting $source from $scheme to $tmp ");
+        # If source is file do not use -C with source
+        } else {
+            pb_system("mkdir -p ".dirname($tmp)." ; cd ".dirname($tmp)."; tar -cf - -C $src ".basename($source)." | tar xf -","Exporting $src/".basename($source)." from $scheme to $tmp ");
+        }
     } else {
         die "Unable to export from svk without a source defined";