Changeset 1896 in ProjectBuilder

Timestamp:

Sep 30, 2014, 10:07:58 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix PBDIR computation when using git+svn (which is like svn with versions not git flat)

Location:

devel

Files:

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

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

@@ -530 +530 @@
 The command name is passed as first parameter.
 The second parameter should be 0 if the command is mandatory, 1 if optional.
+It returns the full path name of the command if found, undef otherwise and dies if that was a mandatory command
 
 =cut

devel/pb/lib/ProjectBuilder/CMS.pm

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