* DistUpgrade/DistUpgradeControler.py:

  - add the Debug::pkgDepCache::AutoInstall debug option
* DistUpgrade/DistUpgradeView.py:
  - add missing import gettext
* DistUpgrade/DistUpgradeViewGtk.py:
  - be more robust against gettext failure
* DistUpgrade/cdromupgrade:
  - fix path

5 files changed, 14 insertions, 3 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 05130f50..799f62a2 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,8 @@
+2006-09-04:
+	- set Debug::pkgDepCache::AutoInstall as debug option too
+	- be more robust against failure from the locales
+2006-09-03:
+	- fix in the cdromupgrade script path detection
 2006-09-01:
 	- make the cdromupgrade wrapper work with the compressed version
           of the upgrader as put onto the CD
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 38d3b73e..13050f49 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -112,6 +112,7 @@ class DistUpgradeControler(object):
 
         # turn on debuging in the cache
         apt_pkg.Config.Set("Debug::pkgProblemResolver","true")
+        apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true")
         fd = os.open("/var/log/dist-upgrade/apt.log",
                      os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644)
         os.dup2(fd,1)
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index 45c5521b..27817b13 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -19,6 +19,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+from gettext import gettext as _
+
 def FuzzyTimeToStr(sec):
   " return the time a bit fuzzy (no seconds if time > 60 secs "
   if sec > 60*60*24:
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index da2d12a9..c58c1fcc 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -305,8 +305,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
     " gtk frontend of the distUpgrade tool "
     def __init__(self):
         # FIXME: i18n must be somewhere relative do this dir
-        bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo"))
-        gettext.textdomain("update-manager")
+        try:
+          bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo"))
+          gettext.textdomain("update-manager")
+        except Exception, e:
+          logging.warning("Error setting locales (%s)" % e)
         
         icons = gtk.icon_theme_get_default()
         gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0))
diff --git a/DistUpgrade/cdromupgrade b/DistUpgrade/cdromupgrade
index 922963e3..9ed8cdea 100755
--- a/DistUpgrade/cdromupgrade
+++ b/DistUpgrade/cdromupgrade
@@ -12,7 +12,7 @@
 #          (e.g. /cdrom/cdromugprade)
 
 CODENAME=edgy
-UPGRADER_DIR=dists/stable/dist-upgrader/binary-all/
+UPGRADER_DIR=dists/stable/main/dist-upgrader/binary-all/
 
 cddirname=${0%\/*}
 fullpath=$cddirname/$UPGRADER_DIR