Changeset 1172 in ProjectBuilder

Timestamp:

Feb 2, 2011, 2:52:37 PM (13 years ago)

Author:

Bruno Cornec

Message:

Fix a bug when initializing a pb env without anything previously available exept the \/bruno/.pbrc

File:

• devel/pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -684 +684 @@
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
-if (($scheme !~ /^cvs/) || ($scheme !~ /^svn/) || ($scheme =~ /^svk/) || ($scheme !~ /^hg/) || ($scheme !~ /^git/) ) {
+if (($scheme !~ /^cvs/) && ($scheme !~ /^svn/) && ($scheme =~ /^svk/) && ($scheme !~ /^hg/) && ($scheme !~ /^git/) ) {
     # Do not compare if it's not a real cms
     return;
-} elsif ((! -d "$ENV{$envar}") || (defined $pbinit)) {
-    if (defined $pbinit) {
-        pb_mkdir_p("$ENV{$envar}");
-    } else {
-        # Either we have a version in the uri, and it should be the same
-        # as the one in the envar. Or we should add the version to the uri
-        if (basename($uri) ne basename($ENV{$envar})) {
-            $uri .= "/".basename($ENV{$envar})
-        }
-        pb_log(1,"Checking out $uri\n");
-        pb_cms_checkout($scheme,$uri,$ENV{$envar});
-    }
+} elsif (defined $pbinit) {
+    pb_mkdir_p("$ENV{$envar}");
+} elsif (! -d "$ENV{$envar}") {
+    # Either we have a version in the uri, and it should be the same
+    # as the one in the envar. Or we should add the version to the uri
+    if (basename($uri) ne basename($ENV{$envar})) {
+        $uri .= "/".basename($ENV{$envar})
+    }
+    pb_log(1,"Checking out $uri\n");
+    pb_cms_checkout($scheme,$uri,$ENV{$envar});
 } else {
     pb_log(1,"$uri found locally, checking content\n");