diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-11-19 13:48:44 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2010-11-19 13:48:44 +0000 |
| commit | 3a16deec73ccb3eaffc85c1126bcb01d52ea32d2 (patch) | |
| tree | ba950d7f10e1022154e58f77245bdf47fc79611e | |
| parent | 39609f4393fee472f8ff3932413aa19281bb5fca (diff) | |
| download | sitesummary-3a16deec73ccb3eaffc85c1126bcb01d52ea32d2.tar.gz sitesummary-3a16deec73ccb3eaffc85c1126bcb01d52ea32d2.tar.bz2 sitesummary-3a16deec73ccb3eaffc85c1126bcb01d52ea32d2.tar.xz | |
Change sitesummary-upload to not try to parse an empty $http_proxy
variable. This get it working on hosts without a proxy setting.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | sitesummary-upload | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a7c6f90..1d10d3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ sitesummary (0.0.67̃~svn70806) UNRELEASED; urgency=low * only run lsscsi from collect.d/system, if /proc/bus/scsi exsists to avoid errors on machines without /sys mouted, like chroots and vservers. (Closes: #602286). + + [ Petter Reinholdtsen ] + * Change sitesummary-upload to not try to parse an empty $http_proxy + variable. This get it working on hosts without a proxy setting. -- Ronny Aasen <ronny@skolelinux.no> Wed, 03 Nov 2010 11:06:12 +0200 diff --git a/sitesummary-upload b/sitesummary-upload index 6e5504c..04aaf4b 100755 --- a/sitesummary-upload +++ b/sitesummary-upload @@ -31,7 +31,7 @@ print "Unable to parse url\n" if ($opts{'d'} && ! $host); my ($http_proxy,$proxy,$port,$remote); $http_proxy=$ENV{'http_proxy'}; -if (defined($http_proxy)) +if (defined($http_proxy) && $http_proxy) { $http_proxy =~ m{http://([^:]*)(?::([0-9]+))?} or die ("unrecognized http_proxy"); |