diff options
| -rw-r--r-- | DistUpgrade/Changelog | 5 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 12 | ||||
| l--------- | DistUpgrade/Ubuntu.info | 1 | ||||
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 7 | ||||
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 14 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 39 | ||||
| -rw-r--r-- | data/channels/Debian.info | 57 | ||||
| -rw-r--r-- | data/channels/Makefile | 4 | ||||
| -rw-r--r-- | data/channels/Ubuntu.info | 264 | ||||
| -rw-r--r-- | data/channels/Ubuntu.info.in | 14 | ||||
| -rw-r--r-- | debian/changelog | 29 | ||||
| -rw-r--r-- | help/C/update-manager-C.omf | 2 |
12 files changed, 427 insertions, 21 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 25d20acb..195e45e1 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,8 @@ +2006-08-18: + - sort the demoted software list +2006-07-31: + - updated to edgy + - uploadedd 2006-05-31: - fix bug in the free space calculation (#47092) - updated ReleaseAnnouncement diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9842484d..3a775099 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -32,7 +32,7 @@ import re import statvfs from DistUpgradeConfigParser import DistUpgradeConfig -from aptsources import SourcesList, SourceEntry, is_mirror +from aptsources import SourcesList, SourceEntry, Distribution, is_mirror from gettext import gettext as _ import gettext from DistUpgradeCache import MyCache @@ -73,6 +73,11 @@ class DistUpgradeControler(object): def rewriteSourcesList(self, mirror_check=True): logging.debug("rewriteSourcesList()") + # enable main (we always need this!) + distro = Distribution() + distro.get_sources(self.sources) + distro.enable_component(self.sources, "main") + # this must map, i.e. second in "from" must be the second in "to" # (but they can be different, so in theory we could exchange # component names here) @@ -143,7 +148,7 @@ class DistUpgradeControler(object): def updateSourcesList(self): logging.debug("updateSourcesList()") - self.sources = SourcesList(withMatcher=False) + self.sources = SourcesList(matcherPath=".") if not self.rewriteSourcesList(mirror_check=True): logging.error("No valid mirror found") res = self._view.askYesNoQuestion(_("No valid mirror found"), @@ -390,7 +395,8 @@ class DistUpgradeControler(object): open(demotions_file).readlines())) installed_demotions = filter(lambda pkg: pkg.isInstalled and pkg.name in demotions, self.cache) if len(installed_demotions) > 0: - demoted = [pkg.name for pkg in installed_demotions] + demoted = [pkg.name for pkg in installed_demotions] + demoted.sort() logging.debug("demoted: '%s'" % " ".join(demoted)) self._view.information(_("Some software no longer officially " "supported"), diff --git a/DistUpgrade/Ubuntu.info b/DistUpgrade/Ubuntu.info new file mode 120000 index 00000000..171be7e1 --- /dev/null +++ b/DistUpgrade/Ubuntu.info @@ -0,0 +1 @@ +../data/channels/Ubuntu.info
\ No newline at end of file diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 8ae98b55..38b55ef5 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -305,11 +305,12 @@ class SoftwareProperties(SimpleGladeApp): for server in self.distro.used_servers: if not re.match(server, self.distro.main_server) and \ not re.match(server, self.distro.nearest_server): - #FIXME: an ubuntu hack - i = server.find("http://") + # FIXME: use regexp here instead of this + country = "" + i = server.find("://") l = server.find(".archive.ubuntu.com") if i != -1 and l != -1: - country = server[i+7:l] + country = server[i+len("://"):l] if self.distro.countries.has_key(country): # TRANSLATORS: %s is a country server_store.append([_("Server for %s") % \ diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index fd77fe63..80781cb0 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -209,10 +209,11 @@ class NullMatcher(object): return True class SourcesList: - def __init__(self, withMatcher=True): + def __init__(self, withMatcher=True, + matcherPath="/usr/share/update-manager/channels/"): self.list = [] # of Type SourceEntries if withMatcher: - self.matcher = SourceEntryMatcher() + self.matcher = SourceEntryMatcher(matcherPath) else: self.matcher = NullMatcher() self.refresh() @@ -378,6 +379,7 @@ class SourceCompTemplate: self.on_by_default = on_by_default class SourceEntryTemplates: + def __init__(self,datadir): _ = gettext.gettext self.templates = [] @@ -411,10 +413,10 @@ class SourceEntryMatcher: self.comps = l_comps self.comps_descriptions = l_comps_descr - def __init__(self): + def __init__(self, matcherPath): self.templates = [] # Get the human readable channel and comp names from the channel .infos - spec_files = glob.glob("/usr/share/update-manager/channels/*.info") + spec_files = glob.glob("%s/*.info" % matcherPath) for f in spec_files: f = os.path.basename(f) i = f.find(".info") @@ -440,9 +442,7 @@ class SourceEntryMatcher: class Distribution: def __init__(self): - """" - Container for distribution specific informations - """ + """ Container for distribution specific informations """ # LSB information self.id = "" self.codename = "" diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 78348e60..3e958db0 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -219,8 +219,9 @@ class UpdateList: " of Ubuntu"), 10), ("%s-updates" % dist, "Ubuntu", _("Recommended updates of " "Ubuntu"), 9), - ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 8), - (dist, "Ubuntu", _("Updates of Ubuntu"), 7)] + ("%s-proposed" % dist, "Ubuntu", _("Proposed updates for Ubuntu"), 8), + ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 7), + (dist, "Ubuntu", _("Updates of Ubuntu"), 6)] self.pkgs = {} self.matcher = {} @@ -671,7 +672,6 @@ class UpdateManager(SimpleGladeApp): apt_pkg.PkgSystemUnLock() except SystemError: pass -# cmd = ["gksu","--", cmd = ["gksu", "--desktop", "/usr/share/applications/synaptic.desktop", "--", "/usr/sbin/synaptic", "--hide-main-window", "--non-interactive", "--parent-window-id", "%s" % (id) ] @@ -713,6 +713,9 @@ class UpdateManager(SimpleGladeApp): # don't display apt-listchanges, we already showed the changelog os.environ["APT_LISTCHANGES_FRONTEND"]="none" + # Do not suspend during the update process + (dev, cookie) = self.inhibit_sleep() + # set window to insensitive self.window_main.set_sensitive(False) self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) @@ -727,18 +730,44 @@ class UpdateManager(SimpleGladeApp): while gtk.events_pending(): gtk.main_iteration() self.fillstore() + + # Allow suspend after synaptic is finished + if cookie != False: + self.allow_sleep(dev, cookie) self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) + def inhibit_sleep(self): + """Send a dbus signal to gnome-power-manager to not suspend + the system""" + try: + bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + devobj = bus.get_object('org.gnome.PowerManager', + '/org/gnome/PowerManager') + dev = dbus.Interface(devobj, "org.gnome.PowerManager") + cookie = dev.Inhibit('UpdateManager', 'Updating system') + return (dev, cookie) + except Exception, e: + print "could not send the dbus Inhibit signal: %s" % e + return (False, False) + + def allow_sleep(self, dev, cookie): + """Send a dbus signal to gnome-power-manager to allow a suspending + the system""" + dev.UnInhibit(cookie) + def toggled(self, renderer, path): """ a toggle button in the listview was toggled """ iter = self.store.get_iter(path) + pkg = self.store.get_value(iter, LIST_PKG) + if pkg is None: + return if self.store.get_value(iter, LIST_INSTALL): self.store.set_value(iter, LIST_INSTALL, False) - self.remove_update(self.store.get_value(iter, LIST_PKG)) + self.remove_update(pkg) else: self.store.set_value(iter, LIST_INSTALL, True) - self.add_update(self.store.get_value(iter, LIST_PKG)) + self.add_update(pkg) def on_treeview_update_row_activated(self, treeview, path, column, *args): """ diff --git a/data/channels/Debian.info b/data/channels/Debian.info new file mode 100644 index 00000000..3958607a --- /dev/null +++ b/data/channels/Debian.info @@ -0,0 +1,57 @@ +ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: sarge +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian 3.1 "Sarge" +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: sarge/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +Description: Debian 3.1 "Sarge" Security Updates +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: etch +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian "Etch" (testing) +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: sid +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian "Sid" (unstable) +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software diff --git a/data/channels/Makefile b/data/channels/Makefile index 3901f9cc..49cc13e1 100644 --- a/data/channels/Makefile +++ b/data/channels/Makefile @@ -5,10 +5,10 @@ INFO_FILES := $(patsubst %.info.in,%.info,$(wildcard *.info.in)) all: $(INFO_FILES) -%.info: %.info.in ../po/$(DOMAIN).pot +%.info: %.info.in sed 's/^_//g' < $< > $@ intltool-extract --type=gettext/rfc822deb $< #intltool-merge -d ../po $< $@ clean: - rm -f $(INFO_FILES) $(wildcard *.h)
\ No newline at end of file + rm -f $(wildcard *.h) diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info new file mode 100644 index 00000000..99c202ba --- /dev/null +++ b/data/channels/Ubuntu.info @@ -0,0 +1,264 @@ +ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 6.10 'Edgy Eft' +Component: main +Enabled: 1 +CompDescription: Officially supported +CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +CompDescription: Community maintained (universe) +CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: edgy +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.10 +Description: Cdrom with Ubuntu 6.10 'Edgy Eft' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: edgy-security +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Important security updates + +Suite: edgy-updates +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Recommended updates + +Suite: edgy-backports +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Backported updates + +Suite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 6.06 LTS 'Dapper Drake' +Component: main +Enabled: 1 +CompDescription: Officially supported +CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +CompDescription: Community maintained (universe) +CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: dapper +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.06 +Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: dapper-security +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Important security updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Recommended updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Backported updates + +Suite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.10 'Breezy Badger' +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright +Component: universe +Enabled: 0 +CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +CompDescription: Non-free (Multiverse) + +Suite: breezy +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.10 +Description: Cdrom with Ubuntu 5.10 'Breezy Badger' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: breezy-security +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 5.10 Security Updates + +Suite: breezy-updates +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.10 Updates + +Suite: breezy-backports +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.10 Backports + +Suite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 'Hoary Hedgehog' +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright +Component: universe +Enabled: 0 +CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +CompDescription: Non-free (Multiverse) + +Suite: hoary +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.04 +Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: hoary-security +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 5.04 Security Updates + +Suite: hoary-updates +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 Updates + +Suite: hoary-backports +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 Backports + +Suite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 'Warty Warthog' +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright +Component: universe +Enabled: 0 +CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +CompDescription: Non-free (Multiverse) + +Suite: warty +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*4.10 +Description: Cdrom with Ubuntu 4.10 'Warty Warthog' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: warty-security +ParentSuite: warty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 4.10 Security Updates + +Suite: warty-updates +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 Updates + +Suite: warty-backports +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 Backports diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index f3eb60d6..5631e93b 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -48,6 +48,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ _Description: Recommended updates +Suite: edgy-proposed +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Proposed updates + Suite: edgy-backports ParentSuite: edgy RepositoryType: deb @@ -103,6 +110,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ _Description: Recommended updates +Suite: dapper-proposed +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Proposed updates + Suite: dapper-backports ParentSuite: dapper RepositoryType: deb diff --git a/debian/changelog b/debian/changelog index 3686ed50..3f60cb20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +update-manager (0.44.4) edgy; urgency=low + + * SoftwareProperties/SoftwareProperties.py: + - don't bomb when searching for the mirror (lp: #57015) + * UpdateManager/UpdateManager.py: + - added "%s-proposed" to the list of known origins + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Aug 2006 13:00:23 +0200 + +update-manager (0.44.3) edgy; urgency=low + + * help/C/update-manager-C.omf: + - fix url (thanks to daniel holbach, lp: #45548) + * show the units better + * don't jump around on row activation + (thanks to Sebastian Heinlein) + * send "inhibit sleep" to power-manager while applying + updates (lp #40697) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 18:06:53 +0200 + +update-manager (0.44.2) edgy; urgency=low + + * added select all/unselect all (thanks to Sebastian Heinlein) + * wording fixes + * fix update counting bug + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 3 Aug 2006 17:52:09 +0200 + update-manager (0.44.1) edgy; urgency=low * make UpdateManager check for new distribution releases by diff --git a/help/C/update-manager-C.omf b/help/C/update-manager-C.omf index a4e6aabc..733461cd 100644 --- a/help/C/update-manager-C.omf +++ b/help/C/update-manager-C.omf @@ -9,7 +9,7 @@ <description> This document explains how to use the Update Manager. </description> <type>manual </type> <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <identifier url=""/> + <identifier url="file:/usr/share/omf/update-manager/update-manager-C.omf"/> <language code="C"/> <relation seriesid="e7ae3bcc-8ce0-11d9-8fa9-d1fb3a9076bb"/> <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" |