diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-05 13:18:47 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-05 13:18:47 +0200 |
| commit | 0704ed7155433750011e128550a8fb55d94121c0 (patch) | |
| tree | 1b84dd739467e8329988140486ccb8d5528525a7 /update-manager | |
| parent | 6d41b5e07b5b58a0d14e4ef12f4c39c658e6da5c (diff) | |
| download | python-apt-0704ed7155433750011e128550a8fb55d94121c0.tar.gz | |
* 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
Diffstat (limited to 'update-manager')
| -rw-r--r-- | update-manager | 25 |
1 files changed, 23 insertions, 2 deletions
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) |