Changeset 2434 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

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

Author:

Bruno Cornec

Message:

force explicit analysis of boolean and when using cluck

File:

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

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();