Changeset 1897 in ProjectBuilder
- Timestamp:
- Sep 30, 2014, 10:07:59 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r1893 r1897 298 298 } else { 299 299 # Pure git 300 # First we may deal with a separat git repo under $dir300 # First we may deal with a separate git repo under $dir 301 301 if ( -d "$dir/.git" ) { 302 302 open(GIT,"LANGUAGE=C $vcscmd --git-dir=$dir/.git remote -v 2> /dev/null |") || return(""); … … 658 658 } 659 659 660 661 660 if ((defined $pdir) && (%pdir) && (defined $pdir{$ENV{'PBPROJ'}})) { 662 661 # That's always the environment variable that will be used … … 686 685 # Either we have a version in the uri, and it should be the same 687 686 # as the one in the envar. Or we should add the version to the uri 688 # # But no ot if it's git as it manages version branches internally687 # # But not if it's git as it manages version branches internally 689 688 if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) { 690 689 $uri .= "/".basename($ENV{$envar}) … … 705 704 # remove schema from `git+file:` and `git+dir:` urls 706 705 # TODO: handle query-parameters 707 $ur l=~ s/^git\+(file|dir)://;706 $uri =~ s/^git\+(file|dir)://; 708 707 # Expand potential env variable in it -- this is required due to the consistency check 709 $ur l=~ s/(\$ENV.+\})/$1/eeg;708 $uri =~ s/(\$ENV.+\})/$1/eeg; 710 709 } elsif ($scheme2 =~ /^hg/) { 711 710 # This VCS manages branches internally not with different tree structures 712 711 # Assuming it's correct for now. 713 } elsif ($cmsurl ne $uri) { 712 return; 713 } 714 715 if ($cmsurl ne $uri) { 714 716 # The local content doesn't correpond to the repository 715 717 pb_log(0,"ERROR: Inconsistency detected:\n");
Note:
See TracChangeset
for help on using the changeset viewer.