* DistUpgrade/DistUpgradeControler.py:

  - fix a bunch of errors

2 files changed, 10 insertions, 7 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 7dc6c1aa..ef4283a5 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -30,6 +30,7 @@ import subprocess
 import logging
 import re
 import statvfs
+import shutil
 from DistUpgradeConfigParser import DistUpgradeConfig
 
 from aptsources import SourcesList, SourceEntry, Distribution, is_mirror
@@ -44,9 +45,10 @@ class AptCdrom(object):
         
     def restoreBackup(self, backup_ext):
         " restore the backup copy of the cdroms.list file (*not* sources.list)! "
-        cdromstate = apt_pkg.Config.Find("Dir::State::cdroms")
-        if os.path.exists(os.path.join(cdromstate,backup_ext)):
-            shutil.copy(os.path.join(cdromstate,backup_ext),cdromstate)
+        cdromstate = os.path.join(apt_pkg.Config.FindDir("Dir::State"),
+                                  apt_pkg.Config.Find("Dir::State::cdroms"))
+        if os.path.exists(cdromstate+backup_ext):
+            shutil.copy(cdromstate+backup_ext, cdromstate)
         # mvo: we don't have to care about restoring the sources.list here because
         #      aptsources will do this for us anyway
         
@@ -55,13 +57,14 @@ class AptCdrom(object):
         logging.debug("AptCdrom.add() called with '%s'", self.cdrompath)
         # do backup (if needed) of the cdroms.list file
         if backup_ext:
-            cdromstate = apt_pkg.Config.Find("Dir::State::cdroms")
-            shutl.copy(cdromstate, os.path.join(cdromstate,backup_ext))
+            cdromstate = os.path.join(apt_pkg.Config.FindDir("Dir::State"),
+                                      apt_pkg.Config.Find("Dir::State::cdroms"))
+            shutil.copy(cdromstate, cdromstate+backup_ext)
         # do the actual work
         apt_pkg.Config.Set("Acquire::cdrom::mount",self.cdrompath);
         cdrom = apt_pkg.GetCdrom()
         # FIXME: add cdrom progress here for the view
-        progress = CdromProgress()
+        progress = apt.progress.CdromProgress()
         res = cdrom.Add(progress)
         logging.debug("AptCdrom.add() returned: %s" % res)
         return res
diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py
index 861f561e..c7a2a7b7 100755
--- a/DistUpgrade/dist-upgrade.py
+++ b/DistUpgrade/dist-upgrade.py
@@ -15,7 +15,7 @@ if __name__ == "__main__":
     (options, args) = parser.parse_args()
 
     if not os.path.exists("/var/log/dist-upgrade"):
-        os.path.mkdir("/var/log/dist-upgrade")
+        os.mkdir("/var/log/dist-upgrade")
     logging.basicConfig(level=logging.DEBUG,
                         filename="/var/log/dist-upgrade/main.log",
                         format='%(asctime)s %(levelname)s %(message)s',