Changeset 2362 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 25, 2019, 12:20:27 PM (5 years ago)

Author:

Bruno Cornec

Message:

better usae of cluck instead of confess to avoid exiting abrutely when not needed

File:

• devel/pb/bin/pb (modified) (10 diffs)

devel/pb/bin/pb

@@ -1985 +1985 @@
             my $keyfile = pb_ssh_get(1);
             pb_mkdir_p("$ENV{'HOME'}/.abuild");
-            open(CONF,"> $ENV{'HOME'}/.abuild/abuild.conf") || confess "Unable to create the abuild conf file";
+            open(CONF,"> $ENV{'HOME'}/.abuild/abuild.conf") || cluck "Unable to create the abuild conf file" && return;
             print CONF "PACKAGER_PRIVKEY=\"$keyfile\"\n" if (defined $keyfile);
             close(CONF);
@@ -2618 +2618 @@
     # Remove a potential $ENV{'HOME'} as tdir should be relative to pb's home
     if ($cmt =~ /^VE/o) {
-        $tdir =~ s|\$ENV.+\}/|| or confess "for $cmt: $tdir must have \$ENV{'HOME'} in it or the remainder of the code won't work since some parts use relative pathing and others will try absolute.  Use a symlink if necessary to place the real files in a different place than under your home directory";
+        $tdir =~ s|\$ENV.+\}/|| or cluck "for $cmt: $tdir must have \$ENV{'HOME'} in it or the remainder of the code won't work since some parts use relative pathing and others will try absolute.  Use a symlink if necessary to place the real files in a different place than under your home directory" && return;
     } else {
         # process, ok if not present.
@@ -2682 +2682 @@
             # TODO: we don't do anything with found !!
             my $found = pb_ve_docker_get_image($tag{$pbstep});
-            confess "No image $tag{$pbstep} available in Docker, please create one first\n" if (not defined $found);
+            cluck "No image $tag{$pbstep} available in Docker, please create one first\n" if (not defined $found);
             # Now we use that image to do what is needed
             # use a dockerfile to ease the creation of next images
@@ -2723 +2723 @@
                 $homedir = `$cmd1 run --cidfile="$cidfile" $tag{$pbstep} grep -E '^$dkaccount:' /etc/passwd | cut -d: -f6`;
                 chomp($homedir);
-                open(CID,"$cidfile") || confess "Unable to open $cidfile";
+                open(CID,"$cidfile") || cluck "Unable to open $cidfile" && return;
                 my $cid = <CID>;
                 close(CID);
@@ -2793 +2793 @@
         my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","pbpkg");
         my $pbextdir = pb_get_extdir();
-        confess "Unable to get package list" if (not defined $pkg);
+        if (not defined $pkg) {
+            cluck "Unable to get package list";
+            return
+        }
 
         # We consider 2 specific packages
@@ -2891 +2894 @@
         }
         my $ts = "$ENV{'PBTMP'}/vebuild/".basename($pbscript2);
-        open(DOCKER," > $ts") || confess "Unable to create $ts";
+        open(DOCKER," > $ts") || cluck "Unable to create $ts" && return;
         print DOCKER "#!/bin/bash\n";
         print DOCKER "# Put content from host to guest, copying to have the correct uid/gid and rights to do so\n";
@@ -3532 +3535 @@
 
     if (($action eq "test") && (! -x "$ENV{'PBDESTDIR'}/pbtest")) {
-        confess "No test script ($ENV{'PBDESTDIR'}/pbtest) found when in test mode. Aborting ...";
+        cluck "No test script ($ENV{'PBDESTDIR'}/pbtest) found when in test mode. Aborting ...";
+        next;
     }
     print SCRIPT "pb --version\n";
@@ -3774 +3778 @@
     # Do not use the one passed potentially with -a
     my ($pbac) = pb_conf_get($vtype."login");
-    confess "No $vtype"."login defined in your project yml conf file" if ((not defined $pbac) || (not defined $pbac->{$ENV{'PBPROJ'}}));
+    if ((not defined $pbac) || (not defined $pbac->{$ENV{'PBPROJ'}})) {
+        cluck "No $vtype"."login defined in your project yml conf file";
+        next;
+    }
 
     my $key = "";
@@ -4898 +4905 @@
 my $bdir;
 
-opendir($bdir,"$dir") || confess "Unable to open directory $dir: $!";
+opendir($bdir,"$dir") || cluck "Unable to open directory $dir: $!" && return;
 foreach my $f (readdir($bdir)) {
     next if ($f =~ /^\./);
@@ -5167 +5174 @@
 if (not defined $ENV{'PBPASSPHRASE'}) {
     if (not defined $ENV{'PBPASSFILE'}) {
-        confess("No pbpassphrase nor pbpassfile defined, unable to handle GPG Release file\n");
+        cluck("No pbpassphrase nor pbpassfile defined, unable to handle GPG Release file\n");
     } else {
-        open(PASS,"$ENV{'PBPASSFILE'}") || confess("Unable to open $ENV{'PBPASSFILE'}\n");
+        open(PASS,"$ENV{'PBPASSFILE'}") || cluck("Unable to open $ENV{'PBPASSFILE'}\n") && return;
         my $pass = <PASS>;
         chomp($pass);