From 681625e65d2f2b543da92a42a52f90f2ab3b1ef2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Apr 2006 17:02:45 +0200 Subject: * janis fake gconf patch added --- UpdateManager/UpdateManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index bdbfc20f..bad5af88 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -28,7 +28,10 @@ pygtk.require('2.0') import gtk import gtk.gdk import gtk.glade -import gconf +try: + import gconf +except: + import fakegconf as gconf import gobject import apt import apt_pkg -- cgit v1.2.3 From b407ce2b2312e82f98d54657b0ca978b9cad4964 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Apr 2006 17:44:50 +0200 Subject: * add "--devel-release" as option --- UpdateManager/MetaRelease.py | 2 +- UpdateManager/UpdateManager.py | 5 ++++- update-manager | 14 +++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index fde705bb..0cfb9f36 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -44,7 +44,7 @@ class MetaRelease(gobject.GObject): # some constants METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" - #METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test2" + METARELEASE_URI_UNSTABLE = "http://changelogs.ubuntu.com/meta-release-development" METARELEASE_FILE = "/var/lib/update-manager/meta-release" __gsignals__ = { diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index bad5af88..93f17a3d 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -738,8 +738,11 @@ class UpdateManager(SimpleGladeApp): self.on_button_reload_clicked(None) - def main(self): + 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) diff --git a/update-manager b/update-manager index 04005c74..6c1f3fd0 100644 --- a/update-manager +++ b/update-manager @@ -33,7 +33,10 @@ from UpdateManager.UpdateManager import UpdateManager import gettext from gettext import gettext as _ +from optparse import OptionParser + if __name__ == "__main__": + _ = gettext.gettext APP="update-manager" DIR="/usr/share/locale" @@ -43,6 +46,15 @@ if __name__ == "__main__": gtk.glade.bindtextdomain(APP, DIR) gtk.glade.textdomain(APP) + # Begin parsing of options + parser = OptionParser() + parser.add_option ("-d", "--devel-release", action="store_true", + dest="devel_release", default=False, + help="Check if upgrading to the latest devel release " + "is possible") + + (options, args) = parser.parse_args() + if os.geteuid() != 0: dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("You need to be root to run this program")) @@ -53,4 +65,4 @@ if __name__ == "__main__": data_dir="/usr/share/update-manager/" #data_dir="/tmp/xxx/share/update-manager/" app = UpdateManager(data_dir) - app.main() + app.main(options) -- cgit v1.2.3 From 1a119e404b4f5bc69d892a2cda4227c6e45af831 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 10 Apr 2006 12:01:56 +0200 Subject: * fix the help string in update-manager (ubuntu: #23274) --- UpdateManager/UpdateManager.py | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 93f17a3d..42982de4 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -182,7 +182,7 @@ class UpdateList: msg = ("%s\n\n%s" % \ (_("Cannot install all available updates"), _("Some updates require the removal of further software. " - "Use the function \"Smart Upgrade\" of the package manager " + "Use the function \"Mark All Upgrades\" of the package manager " "\"Synaptic\" or run \"sudo apt-get dist-upgrade\" in a " "terminal to update your system completely."))) dialog = gtk.MessageDialog(self.parent_window, 0, gtk.MESSAGE_INFO, diff --git a/debian/changelog b/debian/changelog index 08179c32..4afd08a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ update-manager (0.42.2ubuntu12) dapper; urgency=low * channels/*.in: typo fix * po/POTFILES.in: add missing files (ubuntu: #38738) + * fix the help string in update-manager (ubuntu: #23274) -- -- 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 'UpdateManager/UpdateManager.py') 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 8f811a14d7d26d87b9b79a910ba3202c49ebbf94 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 12 Apr 2006 21:05:22 +0200 Subject: * UpdateManager/UpdateManager.py: only supress new release information --- UpdateManager/UpdateManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 5773c5a6..cb2b4d10 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -739,15 +739,15 @@ class UpdateManager(SimpleGladeApp): def main(self, options): + gconfclient = gconf.client_get_default() + self.meta = MetaRelease(options.devel_release) + 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() -- cgit v1.2.3 From f8a44b4bd3f1d72a3c56e5f17a443f33a5868067 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 12 Apr 2006 21:07:55 +0200 Subject: * removed some debug output --- UpdateManager/UpdateManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index cb2b4d10..45638838 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -642,12 +642,12 @@ class UpdateManager(SimpleGladeApp): dialog.destroy() def on_button_dist_upgrade_clicked(self, button): - print "on_button_dist_upgrade_clicked" + #print "on_button_dist_upgrade_clicked" fetcher = DistUpgradeFetcher(self, self.new_dist) fetcher.run() def new_dist_available(self, meta_release, upgradable_to): - print "new_dist_available: %s" % upgradable_to.name + #print "new_dist_available: %s" % upgradable_to.name # check if the user already knowns about this dist #seen = self.gconfclient.get_string("/apps/update-manager/seen_dist") #if name == seen: -- cgit v1.2.3