Changeset 1515

Timestamp:

05/10/12 12:47:51 (13 months ago)

Author:

bruno

Message:

r4760@localhost: bruno | 2012-05-10 11:48:21 +0200

• pb.conf: sudo does not pass through the DEBIAN_FRONTEND variable; use env to make sure it is set. Also change from --force-yes to --allow-unauthenticated (Eric Anderson)
• Base.pm: Provide a better error message for failures of pb_mkdir_p (Eric Anderson)
• Distribution.pm: Make sure to apply the ftp/http proxy when installing dependencies. Also add hack to try the install twice if it fails the first time. That may be unnecessary with the DEBIAN_FRONTEND fix, but doesn't hurt. (Eric Anderson)

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -214 +214 @@
 
 # Command to update the distribution to latest state
-osupd du = sudo /usr/bin/apt-get update; export DEBIAN_FRONTEND="noninteractive"; sudo /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
+osupd du = sudo /usr/bin/apt-get update; sudo env DEBIAN_FRONTEND="noninteractive" /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
 osupd gen = sudo /usr/bin/emerge --update --deep world; sudo /usr/bin/revdep-rebuild
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
@@ -225 +225 @@
 # Chaining the commands allow to only test for what is able to be installed, 
 # not the update of the repo which may well be unaccessible if too old
-osins du = sudo /usr/bin/apt-get update ; sudo /usr/bin/apt-get -y --force-yes install 
+osins du = sudo /usr/bin/apt-get update ; sudo env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y --allow-unauthenticated install 
 osins gen = sudo /usr/bin/emerge 
 osins rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update ; sudo /usr/bin/yum -y install 

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

@@ -14 +14 @@
 use strict;
 use lib qw (lib);
-use Carp 'cluck';
+use Carp qw/confess cluck/;
 use Cwd;
 use File::Path;
@@ -109 +109 @@
 sub pb_mkdir_p {
 my @dir = @_;
-my $ret = mkpath(@dir, 0, 0755);
+my $ret = eval { mkpath(@dir, 0, 0755) };
+confess "pb_mkdir_p @dir failed in ".getcwd().": $@" if ($@);
 return($ret);
 }

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

@@ -10 +10 @@
 use strict;
 use Data::Dumper;
+use Carp 'confess';
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
@@ -303 +304 @@
 my $deps = shift || undef;
 
+my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
+my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
+
+# We do not overwrite shell settings
+$ENV{ftp_proxy} ||= $ftp_proxy;
+$ENV{http_proxy} ||= $http_proxy;
+
 # Protection
 return if (not defined $pbos->{'install'});
@@ -313 +321 @@
 # This may not be // proof. We should test for availability of repo and sleep if not
 my $cmd = "$pbos->{'install'} $deps";
-pb_system($cmd,"Installing dependencies ($cmd)");
+my $ret = pb_system($cmd, "Installing dependencies ($cmd)", undef, 1);
+# Try to accomodate deficient proxies
+if ($ret != 0) {
+    pb_system($cmd, "Re-trying installing dependencies ($cmd)");
+}
 }