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

Timestamp:

Jun 1, 2016, 6:29:31 PM (8 years ago)

Author:

Bruno Cornec

Message:

Fix a bug for git+svn

directories need to be used as with normal svn

File:

• devel/pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)

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

@@ -328 +328 @@
         # transform in full path if relative
         $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$ENV{'PBROOTDIR'}" if ($ENV{'PBROOTDIR'} !~ /^\//);
-        # If git, then versions are in branch not in dirs.
-        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if ($scheme =~ /^git/);
+        # If git, then versions are in branch not in dirs, except for git+svn
+        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if (($scheme =~ /^git/) && ($scheme =~ /^svn/));
         pb_mkdir_p($ENV{'PBROOTDIR'}) if (defined $pbinit);
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});