diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-22 15:41:07 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-22 15:41:07 +0200 |
| commit | 4f1f29f6b9bcc92c10428dc4a3ce783e7ad1f5c5 (patch) | |
| tree | 7cca5c7fcf7f14dd42d1aa426e1183e065003870 | |
| parent | 34a9ff9157da1e60b0fc63b7cf583f8d38a0016e (diff) | |
| download | python-apt-4f1f29f6b9bcc92c10428dc4a3ce783e7ad1f5c5.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- bugfixes in the new "use-backports" code
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 1481769c..22039aae 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -591,8 +591,7 @@ class DistUpgradeControler(object): f, index = ver.FileList.pop(0) pkg._records.Lookup((f,index)) path = apt_pkg.ParseSection(pkg._records.Record)["Filename"] - cand = pkg._depcache.GetCandidateVer(pkg._pkg) - for (packagefile,i) in cand.FileList: + for (packagefile,i) in ver.FileList: indexfile = self.cache._list.FindIndex(packagefile) if indexfile: match = re.match(r"<.*ArchiveURI='(.*)'>$", @@ -615,7 +614,7 @@ class DistUpgradeControler(object): " setup the required backports in a evil way " backportsdir = os.path.normpath(backportsdir) # unpack it - for deb in glob.glob(backportsdir+"*.deb"): + for deb in glob.glob(backportsdir+"/*.deb"): ret = os.system("dpkg-deb -x %s %s" % (deb, backportsdir)) # FIXME: do error checking # setup some pathes to make sure the new stuff is used @@ -624,7 +623,7 @@ class DistUpgradeControler(object): os.putenv("PATH","%s:%s" % (os.path.join(backportsdir,"/usr/bin"),os.getenv("PATH"))) # now exec self again - os.execl(sys.argv[0],["--haveBackports"]) + os.execv(sys.argv[0],[sys.argv[0],"--haveBackports"]) # this is the core def edgyUpgrade(self): |