Changeset 2488 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm

Timestamp:

Mar 30, 2020, 8:21:44 PM (4 years ago)

Author:

Bruno Cornec

Message:

Improve debug messages

• pb_distro_get_param now an internal function printing name of hash members
• use pb_distro_guess instead of pb_distro_get
• pb_distro_get and pb_distro_get_if introduced to replace call to pb_conf_get(_if)* + and old pb_distro_get_param
• add pb_distro_get_in_conf_if for another use case of old pb_distro_get_param
• fix all calls to these functions

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (10 diffs)

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

@@ -3 +3 @@
 # Common functions for virtual environment
 # 
-# Copyright B. Cornec 2007-2016
+# Copyright B. Cornec 2007-today
 # Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
 # Provided under the GPL v2
@@ -119 +119 @@
 
     # We can probably only get those params now we have the distro context
-    my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
+    my ($vesnap,$verebuild) = pb_conf_get_if("vesnap","verebuild");
 
     if (((((defined $verebuild) && (defined $verebuild->{$ENV{'PBPROJ'}}) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbstep == 0)) && ($vetype ne "docker"))
@@ -147 +147 @@
             }
     
-            my $postinstall = pb_ve_get_postinstall($pbos,$rbspi,$verpmstyle);
+            my $postinstall = pb_ve_get_postinstall($pbos,$verpmstyle);
             if ($verpmstyle eq "rinse") {
                 # Need to reshape the mirrors generated with local before-post-install script
                 my $b4post = "--before-post-install ";
-                my $postparam = pb_distro_get_param($pbos,$rbsb4pi);
+                my $postparam = pb_distro_get_if($pbos,"rbsb4pi");
                 if ($postparam eq "") {
                     $b4post = "";
@@ -161 +161 @@
                 my $addpkgs;
                 $postparam = "";
-                $postparam .= pb_distro_get_param($pbos,$osmindep);
+                $postparam .= pb_distro_get_if($pbos,"osmindep");
                 if ($postparam eq "") {
                     $addpkgs = "";
@@ -187 +187 @@
                 my $addpkgs = "";
                 my $postparam = "";
-                $postparam .= pb_distro_get_param($pbos,$osmindep);
+                $postparam .= pb_distro_get_if($pbos,"osmindep");
                 if ($postparam eq "") {
                     $addpkgs = "";
@@ -208 +208 @@
             my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
         
-            my $codename = pb_distro_get_param($pbos,$oscodename);
+            my $codename = pb_distro_get_if($pbos,"oscodename");
             my $postparam = "";
             my $addpkgs;
-            $postparam .= pb_distro_get_param($pbos,$osmindep);
+            $postparam .= pb_distro_get_if($pbos,"osmindep");
             if ($postparam eq "") {
                 $addpkgs = "";
@@ -218 +218 @@
             }
             my $debmir = "";
-            $debmir .= pb_distro_get_param($pbos,$rbsmirrorsrv);
+            $debmir .= pb_distro_get_if($pbos,"rbsmirrorsrv");
     
             # Get potential rbs option
@@ -302 +302 @@
             #
             # We can probably only get those params now we have the distro context
-            my ($osmindep) = pb_conf_get_if("osmindep");
-            my $pkgs = pb_distro_get_param($pbos,$osmindep);
+            my $pkgs = pb_distro_get_if($pbos,"osmindep");
             $pkgs =~ s/,/ /g;
             my $tmpd = "$ENV{'PBTMP'}/Dockerfile";
@@ -335 +334 @@
 
 my $pbos = shift;
-my $rbspi = shift;
 my $vestyle = shift;
 my $post = "";
@@ -346 +344 @@
 }
 
-my $postparam = pb_distro_get_param($pbos,$rbspi);
+my $postparam = pb_distro_get_if($pbos,"rbspi");
 if ($postparam eq "") {
     $post = "";