diff options
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 5 | ||||
| -rw-r--r-- | SoftwareProperties/dialog_cache_outdated.py | 2 | ||||
| -rw-r--r-- | UpdateManager/DistUpgradeFetcher.py | 10 | ||||
| -rw-r--r-- | debian/changelog | 36 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | setup.py | 1 |
6 files changed, 42 insertions, 14 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f1518f37..9ccf12ad 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -75,6 +75,7 @@ class SoftwareProperties(SimpleGladeApp): self.window_main.set_transient_for(parent) # If externally called, reparent to external application. + self.options = options if options and options.toplevel != None: self.window_main.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) self.window_main.show() @@ -194,7 +195,7 @@ class SoftwareProperties(SimpleGladeApp): tr.set_property("ypad", 10) source_col = gtk.TreeViewColumn("Description", tr, markup=LIST_MARKUP) - source_col.set_max_width(500) + #source_col.set_max_width(500) toggle = gtk.CellRendererToggle() toggle.connect("toggled", self.on_channel_toggled) @@ -350,7 +351,7 @@ class SoftwareProperties(SimpleGladeApp): # show a dialog that a reload of the channel information is required # only if there is no parent defined if self.modified == True and \ - self.window_main.get_transient_for() == None: + self.options.toplevel == None: d = dialog_cache_outdated.DialogCacheOutdated(self.window_main, self.datadir) res = d.run() diff --git a/SoftwareProperties/dialog_cache_outdated.py b/SoftwareProperties/dialog_cache_outdated.py index 11935519..de85cc2e 100644 --- a/SoftwareProperties/dialog_cache_outdated.py +++ b/SoftwareProperties/dialog_cache_outdated.py @@ -49,7 +49,7 @@ class DialogCacheOutdated: pass cmd = ["/usr/sbin/synaptic", "--hide-main-window", "--non-interactive", - "--parent-window-id", "%s" % (id), + "--parent-window-id", "%s" % (window_id), "--update-at-startup"] subprocess.call(cmd) lock.release() diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index 676f064b..c6b83994 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -27,6 +27,7 @@ import apt_pkg import tarfile import urllib2 import tempfile +import shutil import GnuPGInterface from gettext import gettext as _ @@ -184,14 +185,7 @@ class DistUpgradeFetcher(object): # cleanup os.chdir("..") # del tmpdir - for root, dirs, files in os.walk(self.tmpdir, topdown=False): - for name in files: - os.remove(os.path.join(root, name)) - #print "would remove file: %s" % os.path.join(root, name) - for name in dirs: - os.rmdir(os.path.join(root, name)) - #print "would remove dir: %s" % os.path.join(root, name) - os.rmdir(self.tmpdir) + shutil.rmtree(self.tmpdir) def run(self): # see if we have release notes diff --git a/debian/changelog b/debian/changelog index e5c87e50..f5132e2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,37 @@ +update-manager (0.42.2ubuntu10) dapper; urgency=low + + * update-manger: fix a missing import (#36138) + * typo fix (#36123) + * correct dapper version number (#36136) + * keybindings fixed (#36116) + * calc the update before downloading the changelog (#36140) + + -- + +update-manager (0.42.2ubuntu9) dapper; urgency=low + + * Better English (tm) (fixes #35985) + * Use the the number of available and not selected updates to determinate + if the system is up-to-date (fixes #35300) + * fix ui problem with software preferences (fixes #35987) + * fix width problem in SoftwareProperties + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 22 Mar 2006 21:57:28 +0100 + +update-manager (0.42.2ubuntu8) dapper; urgency=low + + * fix a FTBFS + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Mar 2006 17:54:08 +0000 + +update-manager (0.42.2ubuntu7) dapper; urgency=low + + * various spelling fixes and ui-glitches + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Mar 2006 16:58:01 +0000 + update-manager (0.42.2ubuntu6) dapper; urgency=low - * SoftwareProperties/: - - fix some UI problems (thanks to Sebastian Heinlein) - - add breezy-updates, breezy-security to the Add dialog * po/pt_BR.po: updated translation (thanks to Carlos Eduardo Pedroza Santiviago) * po/pt.po: updated Portugise translation (thanks to Rui Azevedo) @@ -11,6 +40,7 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low the desktop files * data/gnome-software-properties.desktop.in, update-manager.desktop.in: - added X-Ubuntu-Gettext-Domain + * help/*: updated to latest svn -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 15:58:09 +0100 diff --git a/debian/rules b/debian/rules index 3753e9f7..c8991957 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,8 @@ clean: # Add here commands to clean up after the build process. -$(MAKE) distclean + rm -rf po/mo + find . -name "*.pyc" -exec rm -f {} \; ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -63,6 +63,7 @@ setup(name='update-manager', ), ('share/pixmaps', ["data/update-manager.png"] + ), ] + I18NFILES + HELPFILES, ) |