From d35c7defd7e19b1f7bcb193c86bd1be5c50dd491 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Mar 2006 20:18:16 +0200 Subject: * added the patch from chipzz --- data/SoftwarePropertiesDialogs.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index 7ff8d976..581cc565 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -59,7 +59,7 @@ - + True True True -- cgit v1.2.3 From c5279cfbb9ad48c9d95e535734f311d7c9d98818 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 12 Apr 2006 20:11:08 +0200 Subject: * make it not check for new distro releases anymore for dapper --- UpdateManager/MetaRelease.py | 4 +++- UpdateManager/UpdateManager.py | 15 +++++++++------ data/update-manager.schemas.in | 16 ++++++++++++++++ debian/changelog | 2 ++ update-manager | 3 +++ 5 files changed, 33 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index 0cfb9f36..b655f36a 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -57,8 +57,10 @@ class MetaRelease(gobject.GObject): } - def __init__(self): + def __init__(self, useDevelopmentRelase=False): gobject.GObject.__init__(self) + if useDevelopmentRelase: + self.METARELEASE_URI = self.METARELEASE_URI_UNSTABLE self.metarelease_information = None self.downloading = True # we start the download thread here and we have a timeout diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 42982de4..5773c5a6 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -739,12 +739,15 @@ class UpdateManager(SimpleGladeApp): def main(self, options): - self.meta = MetaRelease() - # the user wants to see the development release - if options.devel_release: - self.meta.METARELEASE_URI = self.meta.METARELEASE_URI_UNSTABLE - self.meta.connect("new_dist_available",self.new_dist_available) - self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported) + # check if we are interessted in dist-upgrade information + # (we are not by default on dapper) + gconfclient = gconf.client_get_default() + if options.check_dist_upgrades or \ + gconfclient.get_bool("/apps/update-manager/check_dist_upgrades"): + # the user wants to see the development release + self.meta = MetaRelease(options.devel_release) + self.meta.connect("new_dist_available",self.new_dist_available) + self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported) while gtk.events_pending(): gtk.main_iteration() diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index 06308871..68a8deef 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -47,6 +47,22 @@ + + /schemas/apps/update-manager/check_dist_upgrades + /apps/update-manager/check_dist_upgrades + update-manager + bool + False + + + Remind to reload the channel list + + If automatic checking for updates is disabeld, you have + to reload the channel list manually. This option allows + to hide the reminder shown in this case. + + + diff --git a/debian/changelog b/debian/changelog index 303e46a2..d00f910b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ update-manager (0.42.2ubuntu12) dapper; urgency=low * fix the help string in update-manager (ubuntu: #23274) * fix the bad grammar in "Cannot install all available updates" (ubuntu: #32864) + * don't inform about new distro release on dapper by default (can be + changed via a gconf setting/commandline switch) -- diff --git a/update-manager b/update-manager index 6c1f3fd0..5c69addc 100644 --- a/update-manager +++ b/update-manager @@ -48,6 +48,9 @@ if __name__ == "__main__": # Begin parsing of options parser = OptionParser() + parser.add_option ("-c", "--check-dist-upgrades", action="store_true", + dest="check_dist_upgrades", default=False, + help="Check if a new distribution release is available") parser.add_option ("-d", "--devel-release", action="store_true", dest="devel_release", default=False, help="Check if upgrading to the latest devel release " -- cgit v1.2.3 From 79037450162dad5a8e96608d1e6d7c9f28957691 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 12 Apr 2006 21:05:03 +0200 Subject: * data/update-manager.schemas.in: fix the description --- data/update-manager.schemas.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index 68a8deef..275f8be5 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -55,11 +55,11 @@ False - Remind to reload the channel list + Check for new distribution releases - If automatic checking for updates is disabeld, you have - to reload the channel list manually. This option allows - to hide the reminder shown in this case. + Check automatically if a new version of the current + distribution is available and offer to upgrade (if + possible). -- cgit v1.2.3