Changeset 1866 in ProjectBuilder

Timestamp:

Apr 3, 2014, 10:29:52 AM (10 years ago)

Author:

Bruno Cornec

Message:

• If using git, then do not use the version name in the URI cloned as it's in the repo in fact.

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)

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

@@ -677 +677 @@
     # 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})) {
+    # # But noot if it's git as it manages version branches internally
+    if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) {
         $uri .= "/".basename($ENV{$envar})
     }

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -93 +93 @@
 #
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
-$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o);
+$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)|(git)\b/o);
 pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);