Changeset 2490 in ProjectBuilder

Timestamp:

Mar 31, 2020, 12:56:06 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix cases where a param could be undefined

File:

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

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

@@ -177 +177 @@
 $pbos->{'family'} = pb_distro_get($pbos,"osfamily");
 $pbos->{'type'} = pb_distro_get($pbos,"ostype");
-($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'update'}) = pb_distro_get($pbos,("os","osins","ossuffix","osupd"));
-($pbos->{'localinstall'},$pbos->{'nover'},$pbos->{'rmdot'}) = pb_distro_get_if($pbos,"oslocalins","osnover","osremovedotinver");
+($pbos->{'os'},$pbos->{'install'},$pbos->{'update'}) = pb_distro_get($pbos,("os","osins","osupd"));
+($pbos->{'localinstall'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'suffix'}) = pb_distro_get_if($pbos,"oslocalins","osnover","osremovedotinver","ossuffix");
 
 # Some OS have no interesting version
@@ -650 +650 @@
 my $repo = pb_distro_get_in_hash_if($pbos,$h,"add".$repotype."repo");
 # 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 "");
+$repo = undef if ((defined $repo) && ($repo eq ""));
 if ($repotype =~ /install/) {
     # Give a probable default if nothing is provided to avoid overloading conf files
@@ -920 +920 @@
 pb_log(3,"Param".Dumper(@param)." has $nb members\n");
 if ($nb eq 1) {
-    pb_log(3,"Retrun Param $param[0]\n");
+    pb_log(3,"Return param $param[0]\n") if (defined $param[0]);
     return($param[0]);
 } else {