aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2010-12-04 11:22:08 +0000
committerHolger Levsen <holger@layer-acht.org>2010-12-04 11:22:08 +0000
commit4e7b12ecaddfbc37cfffa0ffd3251eff29d63edf (patch)
tree6769055f7ab45cffb4cc6197e2178f8feeef7940
parent5249b4130664c744c8b8ae32dacd004c069a530f (diff)
downloadsitesummary-4e7b12ecaddfbc37cfffa0ffd3251eff29d63edf.tar.gz
sitesummary-4e7b12ecaddfbc37cfffa0ffd3251eff29d63edf.tar.bz2
sitesummary-4e7b12ecaddfbc37cfffa0ffd3251eff29d63edf.tar.xz
sitesummary-upload: correct check for empty http_proxy variable.
-rw-r--r--debian/changelog5
-rwxr-xr-xsitesummary-upload2
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 712d4b1..5e9dcf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
sitesummary (0.0.68~svn) UNRELEASED; urgency=low
- [ Ronny Aasen ]
+ [ Ronny Aasen ]
* Fixing my previous fix.
Only run lsscsi from collect.d/system, if /sys/bus/scsi exsists
to avoid errors on machines without /sys mouted, like chroots
and vservers (Closes: #602286).
+ [ Holger Levsen ]
+ * sitesummary-upload: correct check for empty http_proxy variable.
+
-- Petter Reinholdtsen <pere@debian.org> Fri, 19 Nov 2010 15:02:20 +0100
sitesummary (0.0.67) unstable; urgency=low
diff --git a/sitesummary-upload b/sitesummary-upload
index 04aaf4b..050aefa 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) && $http_proxy)
+if (defined($http_proxy) && length($http_proxy))
{
$http_proxy =~ m{http://([^:]*)(?::([0-9]+))?}
or die ("unrecognized http_proxy");