From 0704ed7155433750011e128550a8fb55d94121c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 13:18:47 +0200 Subject: * DistUpgrade/forced_obsoletes.txt: - no longer needed, part of DistUpgrade.cfg now * DistUpgrade/mirrors.txt, DistUpgrade/removal_blacklist.txt: - renamed for consitency * DistUpgrade/DistUpgrade.cfg, DistUpgrade/DistUpgradeCache.py: - added "RemovalBlacklistFile" instead of hardcoding it * DistUpgrade/DistUpgradeConfigParser.py: - added "datadir" to constructor * DistUpgrade/DistUpgradeControler.py: - added datadir * DistUpgrade/DistUpgradeView.py: - added "hideStep()" method - added STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH_INSTALL, STEP_CLEANUP, STEP_REBOOT * DistUpgrade/DistUpgradeViewGtk.py: - implemendted hideStep() - added datadir arguemnt for constructor * dist-upgrade.py - run it with the "." as arguemnt for the config * UpdateManager/UpdateManager.py: - if it can't be updated, ask about a dist-upgrade instead * update-manager. - added --dist-upgrade * po/*.po - make update-po --- update-manager | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'update-manager') diff --git a/update-manager b/update-manager index 5982cab9..ebd8339a 100644 --- a/update-manager +++ b/update-manager @@ -55,10 +55,31 @@ if __name__ == "__main__": dest="devel_release", default=False, help="Check if upgrading to the latest devel release " "is possible") + parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true", + dest="dist_upgrade", default=False, + help="Try to run a dist-upgrade") (options, args) = parser.parse_args() data_dir="/usr/share/update-manager/" #data_dir="/tmp/xxx/share/update-manager/" - app = UpdateManager(data_dir) - app.main(options) + + if options.dist_upgrade == True: + from DistUpgrade.DistUpgradeView import STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH_INSTALL, STEP_CLEANUP, STEP_REBOOT + from DistUpgrade.DistUpgradeViewGtk import DistUpgradeViewGtk + from DistUpgrade.DistUpgradeControler import DistUpgradeControler + # FIXME: we *really* want to different view here + view = DistUpgradeViewGtk(data_dir) + view.setStep(STEP_PREPARE) + view.hideStep(STEP_MODIFY_SOURCES) + view.hideStep(STEP_REBOOT) + controler = DistUpgradeControler(view, datadir=data_dir) + controler.openCache() + if controler.askDistUpgrade(): + view.setStep(STEP_FETCH_INSTALL) + controler.doDistUpgrade() + view.setStep(STEP_CLEANUP) + controler.doPostUpgrade() + else: + app = UpdateManager(data_dir) + app.main(options) -- cgit v1.2.3 From f1c365239ec308d212e6e26ee1424f036ab85de9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 16:43:48 +0200 Subject: * debian/changelog: updated * update-manager: - run the pre-upgrade code as well --- debian/changelog | 2 +- update-manager | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'update-manager') diff --git a/debian/changelog b/debian/changelog index 76a8e64d..f797ce0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ update-manager (0.44.6) edgy; urgency=low that after e.g. a CDROM upgrade the rest of the system can still be fully upgraded over the net - -- Michael Vogt Mon, 4 Sep 2006 22:49:43 +0200 + -- Michael Vogt Tue, 5 Sep 2006 13:30:22 +0200 update-manager (0.44.5) edgy; urgency=low diff --git a/update-manager b/update-manager index ebd8339a..cfaec01c 100644 --- a/update-manager +++ b/update-manager @@ -74,7 +74,8 @@ if __name__ == "__main__": view.hideStep(STEP_MODIFY_SOURCES) view.hideStep(STEP_REBOOT) controler = DistUpgradeControler(view, datadir=data_dir) - controler.openCache() + controler.prepare() + controler.doPreUpgrade() if controler.askDistUpgrade(): view.setStep(STEP_FETCH_INSTALL) controler.doDistUpgrade() -- cgit v1.2.3 From 243e1e9917a332a50397cf542d42dadfc3b5c43c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 19:30:27 +0200 Subject: * update-manager: - show a message after the upgrade - fail if the upgrade is wrong --- update-manager | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'update-manager') diff --git a/update-manager b/update-manager index cfaec01c..21b03702 100644 --- a/update-manager +++ b/update-manager @@ -78,9 +78,12 @@ if __name__ == "__main__": controler.doPreUpgrade() if controler.askDistUpgrade(): view.setStep(STEP_FETCH_INSTALL) - controler.doDistUpgrade() + if not controler.doDistUpgrade(): + sys.exit(1) view.setStep(STEP_CLEANUP) controler.doPostUpgrade() + view.information(_("Upgrade complete"), + _("The upgrade was completed.")) else: app = UpdateManager(data_dir) app.main(options) -- cgit v1.2.3