Changeset 2499 in ProjectBuilder

Timestamp:

Apr 1, 2020, 2:23:56 AM (5 years ago)

Author:

Bruno Cornec

Message:

remove useless pb_distro_get_in_conf_if, fix pb_version_init call and pb_distro_installdeps

File:

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

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

@@ -26 +26 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw(@ISA @EXPORT);
 use Exporter;
  
@@ -34 +34 @@
 our @ISA = qw(Exporter);
 our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_api pb_distro_get pb_distro_get_if pb_distro_getlsb pb_distro_installdeps pb_distro_installpkgs pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
+our ($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 =pod
@@ -417 +417 @@
 my $deps = shift;   # optional list of deps to install
 my $local = shift;   # optional should we install local packages or remote (for deb command is different)
-
-# Get dependencies in the build file if not forced
-$deps = pb_distro_getdeps($f,$pbos, $forcerepo) if ((not defined $deps) || (defined $forcerepo));
-pb_log(2,"deps: $deps\n");
-return if ((not defined $deps) || ($deps =~ /^\s*$/));
+my $deps2;
+
+if (not defined $deps) {
+    $deps = pb_distro_getdeps($f,$pbos, $forcerepo);
+}
+pb_log(2,"deps: $deps\n") if (defined $deps);
+return if (((not defined $deps) || ($deps =~ /^\s*$/));
 
 pb_distro_installpkgs($pbos,$deps,$local);
@@ -578 +580 @@
         # Not reached
     }
-    pb_log(2,"found deps2: $p\n");
     $deps2 .= " $p";
 }
 
 $deps2 =~ s/^\s*//;
-pb_log(2,"now deps2: $deps2\n");
+pb_log(2,"List of missing packages: $deps2\n");
 return($deps2);
 }
@@ -986 +987 @@
 }
 
-=item B<pb_distro_get_in_conf_if>
-
-This function gets the parameters in the conf file passed as name from the most precise tuple up to default
-
-=cut
-
-sub pb_distro_get_in_conf_if {
-
-my $pbos = shift;
-my $conffile = shift;
-
-my @ptr = pb_conf_read($conffile,@_);
-my $var;
-$var->{"ptr"} = \@ptr;
-$var->{"val"} = \@_;
-return(pb_distro_get_param($pbos,$var));
-}
-
 =item B<pb_distro_get_context>