summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-11-22 10:26:05 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-11-22 10:26:05 +0000
commit25b41c4af206222d719e77f7c86fe3a9cc8eac69 (patch)
tree3d4945dcf0764780b12778905fcb86b7db5f5900
parent76530d24408b0cd90144ef8270e9fe4b4cd0e19a (diff)
allow weird practices such as ftp_proxy='' instead of unset altogether
because, apparently, that's what they do in the 3rd world.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackageRepository.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index 4b34d93f10a..770583e75b6 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.90 2010/10/27 14:35:56 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.91 2010/11/22 10:26:04 espie Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -814,7 +814,7 @@ sub get_ftp_list
sub obtain_list
{
my ($self, $error) = @_;
- if (defined $ENV{'ftp_proxy'}) {
+ if (defined $ENV{'ftp_proxy'} && $ENV{'ftp_proxy'} ne '') {
return $self->get_http_list($error);
} else {
return $self->get_ftp_list($error);