diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-02 17:06:07 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-02 17:06:07 +0000 |
| commit | f593c02a4051313dd0044888a26d7ab3f4ba1133 (patch) | |
| tree | 58897c0bf74e68970643bff5eb85a47b5e4e4470 | |
| parent | cbcb6a374bb92bd38e3dac13d5ab78c8fd2a4690 (diff) | |
| download | python-apt-f593c02a4051313dd0044888a26d7ab3f4ba1133.tar.gz | |
* make DistUpgadeConfigParser -> DistUpgradeConfig
| -rw-r--r-- | DistUpgrade/DistUpgrade.cfg | 3 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 4 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeConfigParser.py | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 4 | ||||
| -rwxr-xr-x | DistUpgrade/dist-upgrade.py | 1 |
5 files changed, 9 insertions, 5 deletions
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 |