Changeset 1897 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

• Fix a previous patch on git support for compliance checks which were incorrect. Now works at least with git+svn, and should work the same way as the original patch was intentded to work for native git.

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (4 diffs)

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

@@ -298 +298 @@
     } else {
         # Pure git
-        # First we may deal with a separat git repo under $dir
+        # First we may deal with a separate git repo under $dir
         if ( -d "$dir/.git" ) {
             open(GIT,"LANGUAGE=C $vcscmd --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
@@ -658 +658 @@
 }
 
-
 if ((defined $pdir) && (%pdir) && (defined $pdir{$ENV{'PBPROJ'}})) {
     # 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
     # as the one in the envar. Or we should add the version to the uri
-    # # But noot if it's git as it manages version branches internally
+    # # But not if it's git as it manages version branches internally
     if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) {
         $uri .= "/".basename($ENV{$envar})
@@ -705 +704 @@
         # remove schema from `git+file:` and `git+dir:` urls
         # TODO: handle query-parameters
-        $url =~ s/^git\+(file|dir)://;
+        $uri =~ s/^git\+(file|dir)://;
         # Expand potential env variable in it -- this is required due to the consistency check
-        $url =~ s/(\$ENV.+\})/$1/eeg;
+        $uri =~ s/(\$ENV.+\})/$1/eeg;
     } elsif ($scheme2 =~ /^hg/) {
         # This VCS manages branches internally not with different tree structures
         # Assuming it's correct for now.
-    } elsif ($cmsurl ne $uri) {
+        return;
+    }
+
+    if ($cmsurl ne $uri) {
         # The local content doesn't correpond to the repository
         pb_log(0,"ERROR: Inconsistency detected:\n");