From fa01c040f8dc3caaaf1bd6adc73954fa381f349c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 7 Feb 2006 14:09:22 +0100 Subject: * changelog added --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc2375ef..2577238e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +update-manager (0.42.2ubuntu2) dapper; urgency=low + + * SoftwareProperties/SoftwareProperties.py: + - re-added the internet update options + * data/gnome-software-properties.desktop: + - use gksu instead of gksudo (#30057) + + -- Michael Vogt Tue, 7 Feb 2006 13:13:09 +0100 + update-manager (0.42.2ubuntu1) dapper; urgency=low * UpdateManager/MetaRelease.py: -- cgit v1.2.3 From 6e594d7dc24ee6e91a7294e7051218b044ea76f7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 7 Feb 2006 15:22:52 +0100 Subject: * changelog updates --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bcf7bdea..420d8df1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ update-manager (0.42.2ubuntu2) dapper; urgency=low * SoftwareProperties/SoftwareProperties.py: - - re-added the internet update options + - re-added the internet update options (#27932) * data/gnome-software-properties.desktop: - use gksu instead of gksudo (#30057) * wording fixes (#30296) -- cgit v1.2.3 From f32dce62e3a7543d9fd4e31007cc90fc0ef6839f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Feb 2006 11:55:11 +0100 Subject: * fixed wording issues on the update-manager repo (thanks to Kinnison!) --- channels/Ubuntu.info.in | 4 ++-- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index b347c39a..6422cbdb 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Breezy 6.04 "Dapper Drake" +_Description: Ubuntu 6.04 "Dapper Drake" Component: main Enabled: 1 _CompDescription: Oficially supported @@ -20,7 +20,7 @@ _CompDescription: Non-free (Multiverse) Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Breezy 5.10 "Breezy Badger" +_Description: Ubuntu 5.10 "Breezy Badger" Component: main Enabled: 1 _CompDescription: Oficially supported diff --git a/debian/changelog b/debian/changelog index 420d8df1..c1094b9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.42.2ubuntu3) dapper; urgency=low + + * fixed description of the ubuntu repository (#30813) + + -- + update-manager (0.42.2ubuntu2) dapper; urgency=low * SoftwareProperties/SoftwareProperties.py: -- cgit v1.2.3 From 9d74de48fff54b378bf09544ca1f3a41ca33d88d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Feb 2006 21:14:23 +0100 Subject: * use --parent-window-id instead of gtksocket/gtkplug --- DistUpgrade/DistUpgrade.glade | 2 +- UpdateManager/UpdateManager.py | 127 ++++------------------------------------- debian/changelog | 3 +- debian/control | 2 +- 4 files changed, 16 insertions(+), 118 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 697514cf..6bb0867e 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -1167,7 +1167,7 @@ True - The upgrade of your system requires + The upgrade of your system requires ... to download 2000 MByte diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index b87fb498..0638916f 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -429,95 +429,36 @@ class UpdateManager(SimpleGladeApp): def run_synaptic(self, id, action, lock): try: - apt_pkg.PkgSystemUnLock() + apt_pkg.PkgSystemUnLock() except SystemError: - pass + pass +# cmd = ["gksu","--", cmd = ["/usr/sbin/synaptic", "--hide-main-window", "--non-interactive", - "--plug-progress-into", "%s" % (id) ] + "--parent-window-id", "%s" % (id) ] if action == INSTALL: - cmd.append("--set-selections") cmd.append("--progress-str") cmd.append("%s" % _("Please wait, this can take some time.")) cmd.append("--finish-str") cmd.append("%s" % _("Update is complete")) - proc = subprocess.Popen(cmd, stdin=subprocess.PIPE) - f = proc.stdin + f = tempfile.NamedTemporaryFile() for s in self.packages: f.write("%s\tinstall\n" % s) + cmd.append("--set-selections-file") + cmd.append("%s" % f.name) + f.flush() + subprocess.call(cmd) f.close() - proc.wait() elif action == UPDATE: cmd.append("--update-at-startup") subprocess.call(cmd) else: print "run_synaptic() called with unknown action" sys.exit(1) - - # use this once gksudo does propper reporting - #if os.geteuid() != 0: - # if os.system("gksudo /bin/true") != 0: - # return - # cmd = "sudo " + cmd; lock.release() - def plug_removed(self, w, (win,socket)): - #print "plug_removed" - # plug was removed, but we don't want to get it removed, only hiden - # unti we get more - win.hide() - return True - - def plug_added(self, sock, win): - while gtk.events_pending(): - gtk.main_iteration() - # hack around the problem that too early showing has unpleasnt effect - # (like double arrow, incorrect window size etc) - gobject.timeout_add(500, lambda win: win.show(), win) - def on_button_reload_clicked(self, widget): #print "on_button_reload_clicked" - #self.invoke_manager(UPDATE) - progress = GtkProgress.GtkFetchProgress(self, - _("Reloading the information about " - "latest updates"), - _("It is important to check " - "the software sources for " - "available upgrades reguarly.")) - # FIXME: do a try/except here otherwise it may bomb - try: - self.cache.update(progress) - except (IOError,SystemError), msg: - dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_ERROR, - gtk.BUTTONS_CLOSE,"") - # FIXME: wording - dialog.set_markup("%s"%\ - _("Could not reload the update information")) - dialog.format_secondary_text(_("An error occured during the package " - "list reload. Please see the below " - "information for details what went " - "wrong.")) - diaolg.set_title("") - dialog.set_border_width(6) - dialog.set_size_request(width=500,height=-1) - scroll = gtk.ScrolledWindow() - scroll.set_size_request(-1,200) - scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - text = gtk.TextView() - text.set_editable(False) - text.set_cursor_visible(False) - text.set_wrap_mode(gtk.WRAP_WORD) - buf = text.get_buffer() - buf.set_text("%s" % msg) - scroll.add(text) - dialog.vbox.pack_start(scroll) - scroll.show_all() - dialog.run() - dialog.destroy() - # unlock the cache here, it will be locked again in fillstore - try: - apt_pkg.PkgSystemUnLock() - except SystemError: - pass + self.invoke_manager(UPDATE) self.fillstore() def on_button_help_clicked(self, widget): @@ -529,64 +470,20 @@ class UpdateManager(SimpleGladeApp): def invoke_manager(self, action): # check first if no other package manager is runing - import struct, fcntl - lock = os.path.dirname(apt_pkg.Config.Find("Dir::State::status"))+"/lock" - lock_file= open(lock) - flk=struct.pack('hhllhl',fcntl.F_WRLCK,0,0,0,0,0) - try: - rv = fcntl.fcntl(lock_file, fcntl.F_GETLK, flk) - except IOError: - print "Error getting lockstatus" - raise - locked = struct.unpack('hhllhl', rv)[0] - if locked != fcntl.F_UNLCK: - msg=("%s\n\n%s"%(_("Another package manager is " - "running"), - _("You can run only one " - "package management application " - "at the same time. Please close " - "this other application first."))); - dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_ERROR, - gtk.BUTTONS_CLOSE,"") - dialog.set_markup(msg) - dialog.run() - dialog.destroy() - return # don't display apt-listchanges, we already showed the changelog os.environ["APT_LISTCHANGES_FRONTEND"]="none" # set window to insensitive self.window_main.set_sensitive(False) - # create a progress window that will swallow the synaptic progress bars - win = gtk.Window() - win.set_property("type-hint", gtk.gdk.WINDOW_TYPE_HINT_DIALOG) - win.set_title("") - win.realize() - win.window.set_functions(gtk.gdk.FUNC_MOVE) - win.set_border_width(6) - win.set_transient_for(self.window_main) - win.set_position(gtk.WIN_POS_CENTER_ON_PARENT) - win.set_property("skip-taskbar-hint", True) - win.set_property("skip-pager-hint", True) - win.resize(400,200) - win.set_resizable(False) - - # create the socket - socket = gtk.Socket() - socket.show() - win.add(socket) - - socket.connect("plug-added", self.plug_added, win) - socket.connect("plug-removed", self.plug_removed, (win,socket)) lock = thread.allocate_lock() lock.acquire() - t = thread.start_new_thread(self.run_synaptic,(socket.get_id(),action,lock)) + t = thread.start_new_thread(self.run_synaptic, + (self.window_main.window.xid ,action,lock)) while lock.locked(): while gtk.events_pending(): gtk.main_iteration() time.sleep(0.05) - win.destroy() while gtk.events_pending(): gtk.main_iteration() self.fillstore() diff --git a/debian/changelog b/debian/changelog index c1094b9c..ddbfd48d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ update-manager (0.42.2ubuntu3) dapper; urgency=low * fixed description of the ubuntu repository (#30813) + * use the new synaptic --parent-window-id switch when runing the backend - -- + -- Michael Vogt Wed, 8 Feb 2006 20:53:46 +0100 update-manager (0.42.2ubuntu2) dapper; urgency=low diff --git a/debian/control b/debian/control index 344556b4..314ec741 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1.1 Package: update-manager Architecture: any -Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.4ubuntu4), lsb-release +Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.8), lsb-release Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user choose which to install. -- cgit v1.2.3