Changeset 2462 in ProjectBuilder for devel

Timestamp:

Jan 18, 2020, 6:13:00 PM (5 years ago)

Author:

Bruno Cornec

Message:

Simplify pb_distro_setuprepo

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

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

@@ -648 +648 @@
 $h = pb_conf_cache("$ENV{'PBDESTDIR'}/pbrc.yml",$h) if ((defined $ENV{'PBDESTDIR'}) && (-f "$ENV{'PBDESTDIR'}/pbrc.yml"));
 
-pb_log(3, "INFO: Adding addrepo from config file for $repotype\n");
+my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
+my $repo = pb_distro_get_param($pbos,$addrepo);
 if ($repotype =~ /install/) {
     # Give a probable default if nothing is provided to avoid overloading conf files
     #
-    my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
-    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");
@@ -673 +672 @@
             $ext = ".sources.list";
         }
-        $url .= $ext;
-        return(pb_distro_setuprepo_gen($pbos,$url));
-    } else {
-        return(pb_distro_setuprepo_gen($pbos,$repo));
-    }
-} else {
-    my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
-    my $repo = pb_distro_get_param($pbos,$addrepo);
-    return(pb_distro_setuprepo_gen($pbos,$repo));
-}
+        $repo = $url.$ext;
+    }
+}
+pb_log(1, "INFO: Adding $repo from config file for $repotype step\n");
+return(pb_distro_setuprepo_gen($pbos,$repo));
 }