diff -Nru gnome-app-install-0.5.60.1ubuntu1/AppInstall/AppInstallApp.py gnome-app-install-0.5.60.1ubuntu2/AppInstall/AppInstallApp.py --- gnome-app-install-0.5.60.1ubuntu1/AppInstall/AppInstallApp.py 2009-09-04 14:34:13.000000000 +0200 +++ gnome-app-install-0.5.60.1ubuntu2/AppInstall/AppInstallApp.py 2009-10-12 14:36:48.000000000 +0200 @@ -337,6 +337,7 @@ self.setBusy(True) if self.packaging_backend.addonCD(self.addon_cd, GtkCdromProgress(self)): + cd_desktopdir = os.path.join(self.addon_cd,"app-install") self.desktopdir=cd_desktopdir self.cachedir=None except packaging.AddonCdromError, e: diff -Nru gnome-app-install-0.5.60.1ubuntu1/AppInstall/Menu.py gnome-app-install-0.5.60.1ubuntu2/AppInstall/Menu.py --- gnome-app-install-0.5.60.1ubuntu1/AppInstall/Menu.py 2009-09-04 14:34:13.000000000 +0200 +++ gnome-app-install-0.5.60.1ubuntu2/AppInstall/Menu.py 2009-10-12 14:36:48.000000000 +0200 @@ -126,6 +126,7 @@ # use cached self.pickle (should be renamed to self.categories) # and cache self.pkgs_to_app cname = activation_style.menuCacheName() + cacheLoaded = False if cachedir is not None and os.path.exists("%s/%s" % (cachedir,cname)): progress.label_action.set_label(_("Loading cache...")) cacheLoaded = self.loadMenuCache(os.path.join(cachedir,cname)) diff -Nru gnome-app-install-0.5.60.1ubuntu1/AppInstall/packaging/PackagingBackendApt.py gnome-app-install-0.5.60.1ubuntu2/AppInstall/packaging/PackagingBackendApt.py --- gnome-app-install-0.5.60.1ubuntu1/AppInstall/packaging/PackagingBackendApt.py 2009-09-04 14:34:13.000000000 +0200 +++ gnome-app-install-0.5.60.1ubuntu2/AppInstall/packaging/PackagingBackendApt.py 2009-10-12 14:36:48.000000000 +0200 @@ -20,6 +20,7 @@ mountpoint=addon_cd) if not cdrom.inSourcesList: cdrom.add() + return True except SystemError, e: raise AddonCdromError, e diff -Nru gnome-app-install-0.5.60.1ubuntu1/AppInstall/Version.py gnome-app-install-0.5.60.1ubuntu2/AppInstall/Version.py --- gnome-app-install-0.5.60.1ubuntu1/AppInstall/Version.py 1970-01-01 02:00:00.000000000 +0200 +++ gnome-app-install-0.5.60.1ubuntu2/AppInstall/Version.py 2009-10-12 14:59:01.000000000 +0200 @@ -0,0 +1 @@ +VERSION="0.5.60.1ubuntu2" diff -Nru gnome-app-install-0.5.60.1ubuntu1/debian/changelog gnome-app-install-0.5.60.1ubuntu2/debian/changelog --- gnome-app-install-0.5.60.1ubuntu1/debian/changelog 2009-09-04 14:34:13.000000000 +0200 +++ gnome-app-install-0.5.60.1ubuntu2/debian/changelog 2009-10-12 14:58:17.000000000 +0200 @@ -1,3 +1,9 @@ +gnome-app-install (0.5.60.1ubuntu2) karmic; urgency=low + + * Fixes issues that prevented the use of addon CDs with the --addon-cd option (LP: #449517) + + -- Thomas Fogwill Mon, 12 Oct 2009 14:37:00 +0200 + gnome-app-install (0.5.60.1ubuntu1) karmic; urgency=low * AppInstall/Menu.py: