Просмотр исходного кода

* debian/apt.cron.daily:
- only call gconftool if gcontool is installed (LP: #194281)

Michael Vogt лет назад: 18
Родитель
Сommit
d45c49fcef
3 измененных файлов с 10 добавлено и 5 удалено
  1. 1 1
      configure.in
  2. 1 1
      debian/apt.cron.daily
  3. 8 3
      debian/changelog

+ 1 - 1
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)

+ 1 - 1
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)

+ 8 - 3
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