Changeset 2349 in ProjectBuilder for devel/pb-modules

Timestamp:

Jan 14, 2019, 5:07:22 PM (5 years ago)

Author:

Bruno Cornec

Message:

Fix #174 by adding the conf param pbgitremote with its doc

Location:

devel/pb-modules

Files:

• etc/pb.yml (modified) (1 diff)
• etc/pb.yml.pod (modified) (1 diff)
• lib/ProjectBuilder/VCS.pm (modified) (1 diff)

devel/pb-modules/etc/pb.yml

@@ -833 +833 @@
   deb: ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/pb.sources.list
 
+# default remote git repo name
+pbgitremote:
+  default: origin
+
 # Number of process in // for pb
 #pbparallel:

devel/pb-modules/etc/pb.yml.pod

@@ -530 +530 @@
  Conffile: home
  Example: pbdefdir default = $ENV{'HOME'}/local/pb/projects
+
+=item B<pbgitremote>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: Remote name of the git repository used. The default is origin
+ Conffile: home
+ Example: pbgitremote python-redfish = upstream
 
 =item B<pbgpgcheck>

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

@@ -421 +421 @@
             chdir($cwd) || return("");
         }
+        my ($pborigin) = pb_conf_get("pbgitremote");
         while (<GIT>) {
-            next unless (/^origin\s+(\S+) \(push\)$/);
-            return $1;
+            next unless (/^$pborigin->{$ENV{'PBPROJ'}}\s+(\S+) \(push\)$/);
+            $res = $1;
+            if (($res =~ /@/) && ($res !~ /:\/\//)) {
+                # we have an ssh connection, return it
+                $res = "ssh://$res";
+            }
+            return $res;
         }
         close(GIT);
-        warn "Unable to find a remote git origin under $dir nor $ENV{'PBPROJDIR'}";
+        warn "Unable to find a remote git $pborigin->{$ENV{'PBPROJ'}} under $dir nor $ENV{'PBPROJDIR'}";
         return "";
     }