Changeset 2488 in ProjectBuilder for devel/pbmkbm/bin/pbmkbm

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/pbmkbm/bin/pbmkbm (modified) (8 diffs)

devel/pbmkbm/bin/pbmkbm

@@ -5 +5 @@
 # $Id$
 #
-# Copyright B. Cornec 2011-2016
+# Copyright B. Cornec 2011-today
 # Provided under the GPL v2
 
@@ -418 +418 @@
 
 # Create the directory structure needed on the target dir
-my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get_param($pbos,pb_conf_get("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds"));
+my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get($pbos,("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds"));
 # Create empty dirs for these
 foreach my $d (split(/,/,$tdirs)) {
@@ -456 +456 @@
 # and create the links for it in the target VE
 
-my $busycmd = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-busybox"));
+my $busycmd = pb_distro_get($pbos,"ospathcmd-busybox");
 open(BUSY,"$busycmd |") || (cluck "ERROR: Unable to execute $busycmd" && return);
 my $cmdlist = 0;
@@ -494 +494 @@
 
 pb_log(1,"Analyzing your keyboard's configuration\n");
-my $keyfile = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keyfile"));
-confess "ERROR: Unable to read the keyfile $keyfile" if ((not defined $keyfile) || (! -r $keyfile));
-my $keymapdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapdir"));
-confess "ERROR: Unable to read the keymapdir $keymapdir" if ((not defined $keymapdir) || (! -d $keymapdir));
-my $keymapre = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapre"));
-confess "ERROR: Unable to read the keymapre $keymapre" if (not defined $keymapre);
+my $keyfile = pb_distro_get($pbos,"ospathcmd-keyfile");
+confess "ERROR: Unable to read the keyfile $keyfile" if (! -r $keyfile);
+my $keymapdir = pb_distro_get($pbos,"ospathcmd-keymapdir");
+confess "ERROR: Unable to read the keymapdir $keymapdir" if (! -d $keymapdir);
+my $keymapre = pb_distro_get($pbos,"ospathcmd-keymapre");
 
 # if a direct keymap file is given as keyfile, use only the first existing one and return
@@ -534 +533 @@
 
 pb_log(1,"Analyzing your terminfo's configuration\n");
-my $termdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-termdir"));
-confess "ERROR: Unable to read the keymapdir $termdir" if ((not defined $termdir) || (! -d $termdir));
+my $termdir = pb_distro_get($pbos,"ospathcmd-termdir");
+confess "ERROR: Unable to read the keymapdir $termdir" if (! -d $termdir);
 $tgtree->{$termdir} = "recurdir";
 
@@ -556 +555 @@
 $kernel->{"release"} = pb_get_osrelease();
 
-my $kfile = pb_distro_get_param($pbos,pb_conf_get_if("mkbmkernelfile"));
+my $kfile = pb_distro_get_if($pbos,"mkbmkernelfile");
 if ((defined $kfile) && ($kfile ne "")) {
     pb_log(1,"INFO: You specified your kernel as $kfile, so using it\n");
     $kernel->{"file"} = $kfile;
 } else {
-    $kernel->{"dir"} = pb_distro_get_param($pbos,pb_conf_get("mkbmkerneldir"));
+    $kernel->{"dir"} = pb_distro_get($pbos,"mkbmkerneldir");
     confess "ERROR: The mkbmkerneldir content ($kernel->{'dir'}) doesn't refer to a directory\n" if (! -d $kernel->{"dir"});
     pb_log(1,"INFO: Analyzing directory $kernel->{'dir'} to find your kernel\n");
-    $kernel->{"namere"} = pb_distro_get_param($pbos,pb_conf_get("mkbmkernelnamere"));
+    $kernel->{"namere"} = pb_distro_get($pbos,"mkbmkernelnamere");
 
     # TODO: Look at a better way to find the name of the kernel we run
@@ -612 +611 @@
 my $kernel = shift;
 
-my $lsmod = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-lsmod"));
-my $depmod = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-depmod"));
+my $lsmod = pb_distro_get($pbos,"ospathcmd-lsmod");
+my $depmod = pb_distro_get($pbos,"ospathcmd-depmod");
 open(LSMOD,"$lsmod") || confess "ERROR: Unable to read $lsmod: $!";
 while (<LSMOD>) {
@@ -655 +654 @@
 #
 #my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir");
-#my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep"));
+#my ($pkgs) = pb_distro_get($pbos,"mkbmmindep");
 
 #