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

Timestamp:

Nov 16, 2012, 9:06:13 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Exports function pb_vcs_add_if_not_in
• replace most die by confess

File:

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

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

@@ -266 +266 @@
 if (not defined $lsbf) {
     print STDERR "no lsb entry defined for osrelambfile\n";
-    die "You modified upstream delivery and lost !\n";
+    confess "You modified upstream delivery and lost !\n";
 }
 
@@ -296 +296 @@
 } else {
     print STDERR "Unable to read $lsbf file\n";
-    die "Please report to the maintainer bruno_at_project-builder.org\n";
+    confess "Please report to the maintainer bruno_at_project-builder.org\n";
 }
 }
@@ -328 +328 @@
 
 # Protection
-die "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
+confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
 
@@ -347 +347 @@
 # Check that all deps have been installed correctly
 $deps = pb_distro_getdeps($f, $pbos);
-die "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/));
+confess "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/));
 }
 
@@ -387 +387 @@
 my $oldsep = $/;
 $/ = $sep;
-open(DESC,"$f") || die "Unable to open $f";
+open(DESC,"$f") || confess "Unable to open $f";
 while (<DESC>) {
     pb_log(4,"read: $_\n");
@@ -459 +459 @@
         my $res = pb_system("dpkg -L $p","Looking for $p","mayfail");
         next if ($res eq 0);
-        open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";
+        open(CMD,"dpkg -l $p |") or confess "Unable to run dpkg -l $p: $!";
         my $ok = 0;
         while (<CMD>) {
@@ -583 +583 @@
                 $dirdest = "/etc/zypp/repos.d";
             } else {
-                die "Unknown location for repository file for '$pbos->{install}' command";
+                confess "Unknown location for repository file for '$pbos->{install}' command";
             }
             my $dest = "$dirdest/$bn";
             return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
-            die "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
+            confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dirdest/$bn","Adding $reponame repository") if (not -f "$dirdest/$bn");
         } elsif ($bn =~ /\.addmedia/) {