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

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-modules/lib/ProjectBuilder/Distribution.pm (modified) (10 diffs)

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

@@ -14 +14 @@
 use strict;
 use Data::Dumper;
-use Carp 'confess';
+use Carp qw/cluck confess/;
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
@@ -228 +228 @@
 while (($d,$r) = each %$single_rel_files) {
     if (defined $ambiguous_rel_files->{$d}) {
-        print STDERR "The key $d is considered as both unambiguous and ambigous.\n";
+        print STDERR "The key $d is considered as both unambiguous and ambiguous.\n";
         confess "Please fix your configuration file.\n"
     }
@@ -291 +291 @@
 if ($found == 0) {
     print STDERR "Unable to find a version in ".join(' ',keys %$ambiguous_rel_files)." (ambiguous)\n";
-    print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
     confess "Please report to the maintainer bruno_at_project-builder.org\n";
 } else {
@@ -450 +449 @@
 my $oldsep = $/;
 $/ = $sep;
-open(DESC,"$f") || confess "Unable to open $f";
+open(DESC,"$f") || cluck "Unable to open $f" && return("");
 while (<DESC>) {
     pb_log(4,"read: $_\n");
@@ -541 +540 @@
         my $res = pb_system("dpkg -L $p","Looking for $p","mayfail");
         next if ($res eq 0);
-        open(CMD,"dpkg -l $p |") or confess "Unable to run dpkg -l $p: $!";
+        open(CMD,"dpkg -l $p |") || cluck "Unable to run dpkg -l $p: $!" && next;
         my $ok = 0;
         while (<CMD>) {
@@ -689 +688 @@
                 $dirdest = "/etc/zypp/repos.d";
             } else {
-                confess "Unknown location for repository file for '$pbos->{install}' command";
+                cluck "Unknown location for repository file for '$pbos->{install}' command";
+                next;
             }
             my $dest = "$dirdest/$bn";
             return undef if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
-            confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
+            if (! -d $dirdest) {
+                cluck "Missing directory $dirdest ($reponame)";
+                return undef;
+            }
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
             # OpenSUSE does't seem to import keys automatically
@@ -699 +702 @@
             if ($pbos->{install} =~ /\bzypper\b/) {
                 my $keyfile = undef;
-                open(REPO,"$dest") || confess "Unable to open $dest";
+                open(REPO,"$dest") || cluck "Unable to open $dest" && next;
                 while (<REPO>) {
                     $keyfile = $_;
@@ -728 +731 @@
             # Check whether GPG keys for this repo are already known and if
             # not add them
-            open(REPO,"$dest") || confess "Unable to open $dest";
+            open(REPO,"$dest") || cluck "Unable to open $dest" && next;
             my $debrepo;
             while (<REPO>) {
@@ -744 +747 @@
             pb_system("wget -O $ENV{'PBTMP'}/Release.gpg $debrepo/Release.gpg","Downloading $debrepo/Release.gpg");
             my $signature;
-            open(SIGN,"LANGUAGE=C LANG=C gpg --verify $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || confess "Unable to verify GPG signature from Release.gpg\n";
+            open(SIGN,"LANGUAGE=C LANG=C gpg --verify $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || cluck "Unable to verify GPG signature from Release.gpg\n" && next;
             while(<SIGN>) {
                 chomp();
@@ -757 +760 @@
             }
             close(SIGN);
-            open(SIGN,"LANGUAGE=C LANG=C gpg --verify $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || confess "Unable to verify GPG signature from $debrepo/Release.gpg\n";
+            open(SIGN,"LANGUAGE=C LANG=C gpg --verify $ENV{'PBTMP'}/Release.gpg $ENV{'PBTMP'}/Release 2>&1 |") || cluck "Unable to verify GPG signature from $debrepo/Release.gpg\n" && next;
             while(<SIGN>) {
                 chomp();