Changeset 2437 in ProjectBuilder for devel

Timestamp:

Sep 6, 2019, 5:26:40 PM (6 years ago)

Author:

Bruno Cornec

Message:

Fix installation of external repos which was broken in this version

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)

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

@@ -653 +653 @@
     #
     my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
-    if ((not defined $addrepo) || (not defined $addrepo->{$ENV{'PBPROJ'}})) {
+    my $repo = pb_distro_get_param($pbos,$addrepo);
+    if ((not defined $addrepo) || (not defined $repo)) {
         my ($pbrepo) = pb_conf_get_in_hash_if($h,"pbrepo");
         return(undef) if (not defined $pbrepo);
@@ -675 +676 @@
         return(pb_distro_setuprepo_gen($pbos,$url));
     } else {
-        my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
-        return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
+        return(pb_distro_setuprepo_gen($pbos,$repo));
     }
 } else {
     my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
-    return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
+    my $repo = pb_distro_get_param($pbos,$addrepo);
+    return(pb_distro_setuprepo_gen($pbos,$repo));
 }
 }

devel/pb/bin/pb

@@ -4060 +4060 @@
     }
 
-    my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
-    my $pbrepo = pb_distro_get_param($pbos,$addrepo);
     print SCRIPT << 'EOF';