From 0f3e83010710cf3493c0c9f2bab16e5f028c114c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 2 Feb 2006 15:50:23 +0000 Subject: * make the Config-File more usable --- DistUpgrade/DistUpgradeCache.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index c7cb89f3..45d892c7 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -5,6 +5,7 @@ import os import re import logging from gettext import gettext as _ +from DistUpgradeConfigParser import DistUpgradeConfigParser class MyCache(apt.Cache): # init @@ -12,6 +13,9 @@ class MyCache(apt.Cache): apt.Cache.__init__(self, progress) self.to_install = [] self.to_remove = [] + + self.config = DistUpgradeConfigParser() + # turn on debuging apt_pkg.Config.Set("Debug::pkgProblemResolver","true") fd = os.open(os.path.expanduser("~/dist-upgrade-apt.log"), os.O_RDWR|os.O_CREAT|os.O_TRUNC) @@ -161,14 +165,12 @@ class MyCache(apt.Cache): return metapkg_found # now check for ubuntu-desktop, kubuntu-desktop, edubuntu-desktop - metapkgs = {"ubuntu-desktop": ["gdm","gnome-panel", "ubuntu-artwork"], - "kubuntu-desktop": ["kdm", "kicker", - "kubuntu-artwork-usplash"], - "edubuntu-desktop": ["edubuntu-artwork", "tuxpaint"] - } + metapkgs = self.config.getlist("Distro","MetaPkgs") # we never go without ubuntu-base - self["ubuntu-base"].markInstall() + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + self[pkg].markInstall() + # every meta-pkg that is installed currently, will be marked # install (that result in a upgrade and removes a markDelete) for key in metapkgs: @@ -182,7 +184,7 @@ class MyCache(apt.Cache): logging.debug("no {ubuntu,edubuntu,kubuntu}-desktop pkg installed") for key in metapkgs: deps_found = True - for pkg in metapkgs[key]: + for pkg in self.config.getlist(key,"KeyDependencies"): deps_found &= self.has_key(pkg) and self[pkg].isInstalled if deps_found: logging.debug("guessing '%s' as missing meta-pkg" % key) @@ -208,8 +210,6 @@ class MyCache(apt.Cache): "above first using synaptic or " "apt-get before proceeding.")) return False - - # FIXME: check for ubuntu-desktop, kubuntu-dekstop, edubuntu-desktop return True def _inRemovalBlacklist(self, pkgname): -- cgit v1.2.3 From f593c02a4051313dd0044888a26d7ab3f4ba1133 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 2 Feb 2006 17:06:07 +0000 Subject: * make DistUpgadeConfigParser -> DistUpgradeConfig --- DistUpgrade/DistUpgrade.cfg | 3 +++ DistUpgrade/DistUpgradeCache.py | 4 ++-- DistUpgrade/DistUpgradeConfigParser.py | 2 +- DistUpgrade/DistUpgradeControler.py | 4 ++-- DistUpgrade/dist-upgrade.py | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index b9cb2cc3..cf97d16f 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -1,3 +1,6 @@ +[General] +Frontend=GtkDistUpgradeView + # Distro contains global information about the upgrade [Distro] # the meta-pkgs we support diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 45d892c7..2836d297 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -5,7 +5,7 @@ import os import re import logging from gettext import gettext as _ -from DistUpgradeConfigParser import DistUpgradeConfigParser +from DistUpgradeConfigParser import DistUpgradeConfig class MyCache(apt.Cache): # init @@ -14,7 +14,7 @@ class MyCache(apt.Cache): self.to_install = [] self.to_remove = [] - self.config = DistUpgradeConfigParser() + self.config = DistUpgradeConfig() # turn on debuging apt_pkg.Config.Set("Debug::pkgProblemResolver","true") diff --git a/DistUpgrade/DistUpgradeConfigParser.py b/DistUpgrade/DistUpgradeConfigParser.py index 449e67b2..c87e2f1b 100644 --- a/DistUpgrade/DistUpgradeConfigParser.py +++ b/DistUpgrade/DistUpgradeConfigParser.py @@ -1,7 +1,7 @@ from ConfigParser import ConfigParser, NoOptionError -class DistUpgradeConfigParser(ConfigParser): +class DistUpgradeConfig(ConfigParser): def __init__(self): ConfigParser.__init__(self) self.read(['DistUpgrade.cfg']) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 7ee79cac..3a43d517 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -28,7 +28,7 @@ import subprocess import logging import re import statvfs -from DistUpgradeConfigParser import DistUpgradeConfigParser +from DistUpgradeConfigParser import DistUpgradeConfig from SoftwareProperties.aptsources import SourcesList, SourceEntry from gettext import gettext as _ @@ -42,7 +42,7 @@ class DistUpgradeControler(object): self._view.updateStatus(_("Reading cache")) self.cache = None - self.config = DistUpgradeConfigParser() + self.config = DistUpgradeConfig() self.sources_backup_ext = "."+self.config.get("Files","BackupExt") # some constants here diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index eff05f35..14f9f4a1 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -2,6 +2,7 @@ from DistUpgradeViewGtk import GtkDistUpgradeView from DistUpgradeControler import DistUpgradeControler +from DistUpgradeConfigParser import DistUpgradeConfig import logging import os -- cgit v1.2.3