Changeset 2465 in ProjectBuilder

Timestamp:

Jan 18, 2020, 11:54:17 PM (5 years ago)

Author:

Bruno Cornec

Message:

Fix repo var so it's undef and allow a correct return for pb_distro_setuprepo in all cases

File:

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

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

@@ -634 +634 @@
 
 This function sets up potential additional repository to the build/install/test environment
+If done, it returns forcerepo if a repo was added, if not undef
 
 =cut
@@ -650 +651 @@
 my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
 my $repo = pb_distro_get_param($pbos,$addrepo);
+# If no repo then set it up as undef so the return value is correct from pb_distro_setuprepo_gen
+$repo = undef if ($repo eq "");
 if ($repotype =~ /install/) {
     # Give a probable default if nothing is provided to avoid overloading conf files
@@ -655 +658 @@
     if ((not defined $addrepo) || (not defined $repo)) {
         my ($pbrepo) = pb_conf_get_in_hash_if($h,"pbrepo");
-        return(undef) if (not defined $pbrepo);
+        if (not defined $pbrepo) {
+            cluck("No pbrepo parameter defined in your project configuration file, please fix !");
+            return(undef);
+        }
         my $url = "$pbrepo->{$ENV{'PBPROJ'}}";
         my ($testver,$delivery) = pb_conf_get_in_hash_if($h,"testver","delivery");
@@ -681 +687 @@
 =item B<pb_distro_setuprepo_gen>
 
-This function sets up in a generic way potential additional repository passed as a param
+This functionthe sets up in a generic way potential additional repository passed as a param
+It returns forcerepo if one was added, else undef 
 
 =cut