diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-04 14:23:22 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-04 14:23:22 +0100 |
| commit | d45c49fcef815431b5c1e84be89c5cc99eba52e9 (patch) | |
| tree | 9b4744eb5422d499a6efb6f4a5c7e79a9c52b798 | |
| parent | 604c9ee885ba964a4057a6e9ba1f54103afee83d (diff) | |
* debian/apt.cron.daily:
- only call gconftool if gcontool is installed (LP: #194281)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 2 | ||||
| -rw-r--r-- | debian/changelog | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 252018e37..7b0bafb24 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu11") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu12") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b0164a576..2f1a59744 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -200,7 +200,7 @@ fi # set the proxy based on the admin users gconf settings admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) -if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then +if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy) host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host) port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port) diff --git a/debian/changelog b/debian/changelog index cb7755547..3cf47a9c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,18 @@ +apt (0.7.9ubuntu13) hardy; urgency=low + + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) + + -- Lionel Porcheron <lionel.porcheron@ubuntu.com> Sat, 01 Mar 2008 11:38:41 +0100 + apt (0.7.9ubuntu12) hardy; urgency=low * debian/apt.cron.daily: - use admin user proxy settings * cmdline/apt-get.cc: - fix task installation (thanks to Colin Watson) - * debian/apt.cron.daily: - - show update-notifier notification on authentication failure - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100 apt (0.7.9ubuntu11) hardy; urgency=low |