Changeset 2091 in ProjectBuilder


Ignore:
Timestamp:
Jun 1, 2016, 6:29:31 PM (5 years ago)
Author:
Bruno Cornec
Message:

Fix a bug for git+svn

directories need to be used as with normal svn

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Env.pm

    r2084 r2091  
    328328        # transform in full path if relative
    329329        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$ENV{'PBROOTDIR'}" if ($ENV{'PBROOTDIR'} !~ /^\//);
    330         # If git, then versions are in branch not in dirs.
    331         $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if ($scheme =~ /^git/);
     330        # If git, then versions are in branch not in dirs, except for git+svn
     331        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if (($scheme =~ /^git/) && ($scheme =~ /^svn/));
    332332        pb_mkdir_p($ENV{'PBROOTDIR'}) if (defined $pbinit);
    333333        die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
Note: See TracChangeset for help on using the changeset viewer.