Browse Source

* Merge from Ubuntu:

- Make sure to exit services-select generator cleanly if
    apt-setup/services-select is empty.

r57878
tags/0.41
Colin Watson 12 years ago
parent
commit
d60a172fe8
2 changed files with 9 additions and 1 deletions
  1. +8
    -0
      debian/changelog
  2. +1
    -1
      generators/90services-select

+ 8
- 0
debian/changelog View File

@@ -1,3 +1,11 @@
apt-setup (1:0.41) UNRELEASED; urgency=low

* Merge from Ubuntu:
- Make sure to exit services-select generator cleanly if
apt-setup/services-select is empty.

-- Colin Watson <cjwatson@debian.org> Fri, 20 Mar 2009 17:59:34 +0000

apt-setup (1:0.40) unstable; urgency=low

[ Colin Watson ]


+ 1
- 1
generators/90services-select View File

@@ -63,7 +63,7 @@ fi

# No need to set up proxy here if no services were selected
db_get apt-setup/services-select
[ "$RET" ] || exit
[ "$RET" ] || exit 0

# Proxy configuration is common to both security and volatile
if db_get mirror/http/proxy && [ -n "$RET" ]; then


Loading…
Cancel
Save