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

Timestamp:

Oct 7, 2012, 6:07:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Avoid to emit msgs when sed -i doesn't work (as on RedHat 6.2)
• Factorize the proxy usages in pb_apply_conf_proxy and make it public (was partly done only)
• debug level is now passed to the vescrip improving debug capabilities in that script
• /dev/null shouldn't be touched on RedHat 6.2 as recreating it doesn't seem to work
• Allow usage of mayfailverbose in pb_system when both features are needed to help debuging
• Imrpove again RedHat 6.2 support up to setupve now (however needs a manual install of perl 5.6.2 to work as the minimum version for pb)

File:

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

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist);
+our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_apply_conf_proxy);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -306 +306 @@
 
 # We do not overwrite shell settings
-$ENV{ftp_proxy} ||= $ftp_proxy;
-$ENV{http_proxy} ||= $http_proxy;
+$ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
+$ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
 }