Changeset 2434 in ProjectBuilder for devel

Timestamp:

Sep 6, 2019, 3:35:27 PM (6 years ago)

Author:

Bruno Cornec

Message:

force explicit analysis of boolean and when using cluck

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (6 diffs)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)
• pbmkbm/bin/pbmkbm (modified) (1 diff)

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

@@ -185 +185 @@
 # Read the content of the config file and cache it in the %h hash then available for queries
 if ($PBCONFVER < 1) {
-    open(CONF,$cf) || cluck "Unable to open $cf" && return($lh);
+    open(CONF,$cf) || (cluck "Unable to open $cf" && return($lh));
     # This is the original conf file format for versions up to 0.14
     while(<CONF>) {
@@ -337 +337 @@
 confess "No configuration file defined to write into !" if (not defined $conffile);
 confess "No hash defined to read from !" if (not defined $h);
-open(CONF,"> $conffile") || cluck "Unable to write into $conffile" && return;
+open(CONF,"> $conffile") || (cluck "Unable to write into $conffile" && return);
 
 if ($PBCONFVER < 1) {
@@ -553 +553 @@
 my $dest = shift;
 
-open(ORIG,$orig) || cluck "Unable to open $orig" && return;
+open(ORIG,$orig) || (cluck "Unable to open $orig" && return);
 confess "Will not erase existing $dest while transforming $orig" if (-f $dest);
-open(DEST,"> $dest") || cluck "Unable to write into $dest" && close(ORIG) && return;
+open(DEST,"> $dest") || (cluck "Unable to write into $dest" && close(ORIG) && return);
 print DEST "---\n";
 my $pbconfverbkp = $PBCONFVER;

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

@@ -472 +472 @@
 my $oldsep = $/;
 $/ = $sep;
-open(DESC,"$f") || cluck "Unable to open $f" && return("");
+open(DESC,"$f") || (cluck "Unable to open $f" && return(""));
 while (<DESC>) {
     pb_log(4,"read: $_\n");
@@ -563 +563 @@
         my $res = pb_system("dpkg -L $p","Looking for $p","mayfail");
         next if ($res eq 0);
-        open(CMD,"dpkg -l $p |") || cluck "Unable to run dpkg -l $p: $!" && next;
+        open(CMD,"dpkg -l $p |") || (cluck "Unable to run dpkg -l $p: $!" && next);
         my $ok = 0;
         while (<CMD>) {
@@ -749 +749 @@
             if ($pbos->{install} =~ /\bzypper\b/) {
                 my $keyfile = undef;
-                open(REPO,"$dest") || cluck "Unable to open $dest" && next;
+                open(REPO,"$dest") || (cluck "Unable to open $dest" && next);
                 while (<REPO>) {
                     $keyfile = $_;
@@ -767 +767 @@
             # URPMI repo
             # We should test that it's not an already setup urpmi repo
-            open(URPMI,"/etc/urpmi/urpmi.cfg") || cluck "Unable to open /etc/urpmi/urpmi.cfg" && next;
+            open(URPMI,"/etc/urpmi/urpmi.cfg") || (cluck "Unable to open /etc/urpmi/urpmi.cfg" && next);
             my $found = 0;
             my $entry = $bn;
@@ -786 +786 @@
             # Check whether GPG keys for this repo are already known and if
             # not add them
-            open(REPO,"$dest") || cluck "Unable to open $dest" && next;
+            open(REPO,"$dest") || (cluck "Unable to open $dest" && next);
             my $debrepo;
             while (<REPO>) {
@@ -807 +807 @@
             $keyserver = $pbgpgserver->{'default'} if (not defined $keyserver);
             confess "Unable to find a GPG server in configuration, please define correctly pbgpgserver" if (not defined $keyserver);
-            open(SIGN,"LANGUAGE=C LANG=C gpg --verify --keyid-format=long $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || cluck "Unable to verify GPG signature from Release.gpg\n" && next;
+            open(SIGN,"LANGUAGE=C LANG=C gpg --verify --keyid-format=long $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || (cluck "Unable to verify GPG signature from Release.gpg\n" && next);
             while(<SIGN>) {
                 chomp();

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

@@ -869 +869 @@
     }
 }
-pb_log(1,"pb_vcs_compliant end\n");
+pb_log(2,"pb_vcs_compliant end\n");
 }
 

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -194 +194 @@
 if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
     if (! -f "$dest/ChangeLog") {
-        open(CL,"> $dest/ChangeLog") || cluck "Unable to create $dest/ChangeLog" && return;
+        open(CL,"> $dest/ChangeLog") || (cluck "Unable to create $dest/ChangeLog" && return);
         # We need a minimal version for debian type of build
         print CL "\n";

devel/pbmkbm/bin/pbmkbm

@@ -457 +457 @@
 
 my $busycmd = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-busybox"));
-open(BUSY,"$busycmd |") || cluck "ERROR: Unable to execute $busycmd" && return;
+open(BUSY,"$busycmd |") || (cluck "ERROR: Unable to execute $busycmd" && return);
 my $cmdlist = 0;
 while (<BUSY>) {