diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-03-30 13:26:35 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-03-30 13:26:35 +0200 |
| commit | 20f6e22e3af58a073579af43691d316927e4a69d (patch) | |
| tree | 24d385b236a88b439119daf2ad3ea2220d6bc1f8 | |
| parent | 089a4fd2d8ebdc3f8a3bf097d1a1e20d6256b91e (diff) | |
* debian/apt.cron.daily:
- do not clutter cron mail with bogus gconftool messages
(LP: #223502)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 6 | ||||
| -rw-r--r-- | debian/changelog | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/configure.in b/configure.in index ed3109563..130fe065d 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.20.2ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index f4eb6117a..bb72780a5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -210,9 +210,9 @@ 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" ] && [ -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) + use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null) + host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) + port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then export http_proxy="http://$host:$port/" fi diff --git a/debian/changelog b/debian/changelog index bce1fa462..62ce48ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -apt (0.7.20.2ubuntu5) UNRELEASED; urgency=low +apt (0.7.20.2ubuntu5) jaunty; urgency=low + [ Colin Watson ] * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). + + [ Michael Vogt ] + * debian/apt.cron.daily: + - do not clutter cron mail with bogus gconftool messages + (LP: #223502) - -- Colin Watson <cjwatson@ubuntu.com> Thu, 26 Mar 2009 23:50:56 +0000 + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200 apt (0.7.20.2ubuntu4) jaunty; urgency=low |