From 3c13b603ab6bb720861441a3992bff55831942bf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Sep 2006 19:07:42 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - add clear() function that is autoMark friendly * DistUpgrade/DistUpgradeControler.py: - bugfixes - pass the old arguments to the new execed child * DistUpgrade/dist-upgrade.py: - remove debug output --- DistUpgrade/DistUpgradeControler.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 7d48db69..441952b2 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -557,15 +557,17 @@ class DistUpgradeControler(object): apt_pkg.Config.FindDir("Dir::Etc::sourceparts")) # run update self.doUpdate() + self.openCache() + # save cachedir and setup new one cachedir = apt_pkg.Config.Find("Dir::Cache::archives") cwd = os.getcwd() backportsdir = os.path.join(os.getcwd(),"backports") - os.chdir(backportsdir) if not os.path.exists(backportsdir): os.mkdir(backportsdir) if not os.path.exists(os.path.join(backportsdir,"partial")): os.mkdir(os.path.join(backportsdir,"partial")) + os.chdir(backportsdir) apt_pkg.Config.Set("Dir::Cache::archives",backportsdir) # mark the backports for upgrade and get them @@ -623,7 +625,7 @@ class DistUpgradeControler(object): os.getenv("PATH")) # now exec self again - os.execve(sys.argv[0],[sys.argv[0],"--have-backports"], os.environ) + os.execve(sys.argv[0],sys.argv+["--have-backports"], os.environ) # this is the core def edgyUpgrade(self): -- cgit v1.2.3