From 8da0ea4e985d947ff176d2f5e5eada1f1d255a1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Jun 2006 10:19:54 +0200 Subject: * speedups in the MyCache.clear() code * minor code cleanups (move the depcache code into _initDepCcche()) --- UpdateManager/UpdateManager.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d4cc7a59..109e4d0c 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -83,11 +83,19 @@ CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chan class MyCache(apt.Cache): def __init__(self, progress): apt.Cache.__init__(self, progress) + self._initDepCache() assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0 self.all_changes = {} + def _initDepCache(self): + #apt_pkg.Config.Set("Debug::pkgPolicy","1") + #self.depcache = apt_pkg.GetDepCache(self.cache) + #self._depcache = apt_pkg.GetDepCache(self._cache) + self._depcache.ReadPinFile() + if os.path.exists(SYNAPTIC_PINFILE): + self._depcache.ReadPinFile(SYNAPTIC_PINFILE) + self._depcache.Init() def clean(self): - for pkg in self: - pkg.markKeep() + self._initDepCache() def saveDistUpgrade(self): """ this functions mimics a upgrade but will never remove anything """ self._depcache.Upgrade(True) @@ -755,13 +763,6 @@ class UpdateManager(SimpleGladeApp): sys.exit(1) else: progress.hide() - #apt_pkg.Config.Set("Debug::pkgPolicy","1") - #self.depcache = apt_pkg.GetDepCache(self.cache) - self.cache._depcache.ReadPinFile() - if os.path.exists(SYNAPTIC_PINFILE): - self.cache._depcache.ReadPinFile(SYNAPTIC_PINFILE) - self.cache._depcache.Init() - def check_auto_update(self): # Check if automatic update is enabled. If not show a dialog to inform -- cgit v1.2.3 From 0d18962ad55ef1fd31974e46a65fd2fffb4a9baa Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Wed, 28 Jun 2006 20:58:26 +0200 Subject: * start merging my old repo rewrite stuff --- SoftwareProperties/aptsources.py | 234 +++++++++++++-------------------------- UpdateManager/Common/DistInfo.py | 69 ++++++++---- channels/Ubuntu.info.in | 152 +++++++++++++++++++++++-- 3 files changed, 270 insertions(+), 185 deletions(-) (limited to 'UpdateManager') diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 74ef2f4a..5735960b 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -89,6 +89,7 @@ class SourceEntry: file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") self.file = file self.parse(line) + self.template = None # works mostely like split but takes [] into account def mysplit(self, line): @@ -207,6 +208,7 @@ class SourceEntry: class SourcesList: def __init__(self): self.list = [] # of Type SourceEntries + self.matcher = SourceEntryMatcher() self.refresh() def refresh(self): @@ -219,6 +221,10 @@ class SourcesList: partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") for file in glob.glob("%s/*.list" % partsdir): self.load(file) + # check if the source item fits a predefined template + for source in self.list: + if source.invalid == False: + self.matcher.match(source) def __iter__(self): for entry in self.list: @@ -241,7 +247,9 @@ class SourcesList: if comment != "": line = "%s #%s\n" %(line,comment) line = line + "\n" - self.list.insert(pos, SourceEntry(line)) + new_entry = SourceEntry(line) + self.matcher.match(new_entry) + self.list.insert(pos, new_entry) def remove(self, source_entry): self.list.remove(source_entry) @@ -271,12 +279,16 @@ class SourcesList: def load(self,file): """ (re)load the current sources """ - f = open(file, "r") - lines = f.readlines() - for line in lines: - source = SourceEntry(line,file) - self.list.append(source) - f.close() + try: + f = open(file, "r") + lines = f.readlines() + for line in lines: + source = SourceEntry(line,file) + self.list.append(source) + except: + print "could not open file '%s'" % file + else: + f.close() def save(self): """ save the current sources """ @@ -288,6 +300,41 @@ class SourcesList: for f in files: files[f].close() + def check_for_relations(self, sources_list): + """get all parent and child channels in the sources list""" + parents = [] + used_child_templates = {} + for source in sources_list: + # try to avoid checking uninterressting sources + if source.template == None: + continue + # set up a dict with all used child templates and corresponding + # source entries + if source.template.child == True: + key = source.template + if not used_child_templates.has_key(key): + used_child_templates[key] = [] + temp = used_child_templates[key] + temp.append(source) + else: + # store each source with children aka. a parent :) + if len(source.template.children) > 0: + parents.append(source) + #print self.used_child_templates + #print self.parents + return (parents, used_child_templates) + + def check_for_endangered_dists(self): + """set the components of a child source to the ones of the parent channel""" + (parents, used_child_templates) = self.check_for_relations(self.list) + # the magical part + for mother in parents: + for child_template in mother.template.children: + if used_child_templates.has_key(child_template): + for child in used_child_templates[child_template]: + if child.type == mother.type: + child.comps = mother.comps + # templates for the add dialog class SourceEntryTemplate(SourceEntry): def __init__(self,a_type,uri,dist,description,comps): @@ -354,121 +401,20 @@ class SourceEntryMatcher: self.comps_descriptions = l_comps_descr def __init__(self): - _ = gettext.gettext - self.type_list = [] - self.type_list.append(self.MatchType("^deb$",_("Binary"))) - self.type_list.append(self.MatchType("^deb-src$",_("Source"))) - - self.dist_list = [] - - ubuntu_comps = ["^main$","^restricted$","^universe$","^multiverse$"] - ubuntu_comps_descr = [_("Officially supported"), - _("Restricted copyright"), - _("Community maintained (Universe)"), - _("Non-free (Multiverse)")] - # CDs - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06", - ".*", - _("CD disk with Ubuntu 6.06 LTS"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", - ".*", - _("CD disk with Ubuntu 5.10"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", - ".*", - _("CD disk with Ubuntu 5.04"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", - ".*", - _("CD disk with Ubuntu 4.10"), - ubuntu_comps, ubuntu_comps_descr)) - # URIs - # Warty - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty$", - "Ubuntu 4.10", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^warty-security$", - _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-security$", - _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-updates$", - _("Ubuntu 4.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-backports$", - _("Ubuntu 4.10 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - # Hoary - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-security$", - _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^hoary-security$", - _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary$", - "Ubuntu 5.04", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-updates$", - _("Ubuntu 5.04 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-backports$", - _("Ubuntu 5.04 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - # Breezy - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-security$", - _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^breezy-security$", - _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy$", - "Ubuntu 5.10", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-backports$", - _("Ubuntu 5.10 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-updates$", - _("Ubuntu 5.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - # dapper - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-security$", - _("Ubuntu 6.06 LTS Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^dapper-security$", - _("Ubuntu 6.06 LTS Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper$", - "Ubuntu 6.06 LTS", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-backports$", - _("Ubuntu 6.06 LTS Backports"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-updates$", - _("Ubuntu 6.06 LTS Updates"), - ubuntu_comps, ubuntu_comps_descr)) - + self.templates = [] + # Get the human readable channel and comp names from the channel .infos + spec_files = glob.glob("/usr/share/update-manager/channels/*.info") + for f in spec_files: + f = os.path.basename(f) + i = f.find(".info") + f = f[0:i] + dist = DistInfo(f) + for suite in dist.suites: + if suite.match_uri != None: + self.templates.append(suite) + + # FIXME: The specifications should go into the .info files + return # DEBIAN debian_comps = ["^main$","^contrib$","^non-free$","^non-US$"] @@ -518,43 +464,21 @@ class SourceEntryMatcher: self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", "^unstable.*$", _("Debian Non-US (Unstable)"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) - - - - def match(self,source): + def match(self, source): + """Add a matching template to the source""" _ = gettext.gettext - # some sane defaults first - type_description = source.type - dist_description = source.uri + " " + source.dist - comp_description = "" - for c in source.comps: - comp_description = comp_description + " " + c - - for t in self.type_list: - if re.match(t.type, source.type): - type_description = _(t.description) - break - - for d in self.dist_list: + found = False + for template in self.templates: #print "'%s'" %source.uri - if re.match(d.uri, source.uri) and re.match(d.dist,source.dist): - dist_description = d.description - comp_description = "" - for c in source.comps: - found = False - for i in range(len(d.comps)): - if re.match(d.comps[i], c): - comp_description = comp_description+"\n"+d.comps_descriptions[i] - found = True - if found == False: - comp_description = comp_description+" "+c + if re.search(template.match_uri, source.uri) and \ + re.match(template.match_name, source.dist): + found = True + source.template = template break - - - return (type_description,dist_description,comp_description) - + return found # some simple tests if __name__ == "__main__": diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 102b981c..873d7132 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -28,21 +28,29 @@ import ConfigParser _ = gettext.gettext class Suite: - name = None - description = None - base_uri = None - repository_type = None - components = None + def __init__(self): + self.name = None + self.child = False + self.match_name = None + self.description = None + self.base_uri = None + self.type = None + self.components = {} + self.children = [] + self.match_uri = None + self.distribution = None + self.available = True class Component: - name = None - description = None - enabled = None + def __init__(self): + self.name = None + self.description = None + self.enabled = None class DistInfo: def __init__(self, dist = None, - base_dir = "/usr/share/update-manager/dists"): + base_dir = "/usr/share/update-manager/channels"): self.metarelease_uri = '' self.suites = [] @@ -73,21 +81,36 @@ class DistInfo: elif field == 'Suite': if suite: if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled) component = None self.suites.append (suite) suite = Suite () suite.name = value - suite.components = [] + suite.distribution = dist + suite.match_name = "^%s$" % value + elif field == 'MatchName': + suite.match_name = value + elif field == 'ParentSuite': + suite.child = True + for nanny in self.suites: + if nanny.name == value: + nanny.children.append(suite) + elif field == 'Available': + suite.available = value elif field == 'RepositoryType': - suite.repository_type = value + suite.type = value elif field == 'BaseURI': suite.base_uri = value + suite.match_uri = value + elif field == 'MatchURI': + suite.match_uri = value elif field == 'Description': suite.description = _(value) elif field == 'Component': if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled) component = Component () component.name = value elif field == 'Enabled': @@ -96,20 +119,24 @@ class DistInfo: component.description = _(value) if suite: if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled) component = None self.suites.append (suite) suite = None if __name__ == "__main__": - d = DistInfo ("Debian", "../../channels") + d = DistInfo ("Ubuntu", "../../channels") print d.changelogs_uri for suite in d.suites: - print suite.name - print suite.description - print suite.base_uri + print "\nSuite: %s" % suite.name + print "Desc: %s" % suite.description + print "BaseURI: %s" % suite.base_uri + print "MatchURI: %s" % suite.match_uri for component in suite.components: - print component.name - print component.description - print component.enabled + print " %s - %s - %s " % (component.name, + component.description, + component.enabled) + for child in suite.children: + print " %s" % child.description diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index 94833aca..4bda6077 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -3,7 +3,8 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.06 LTS +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.04 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Officially supported @@ -17,11 +18,44 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) +Suite: dapper +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.04 +_Description: Cdrom with Ubuntu 6.04 '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/ -_Description: Ubuntu 6.06 LTS Security Updates -Component: main +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Ubuntu 6.04 Security Updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.04 Updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.04 Backports + +Suite: dapper-backports +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 'Breezy Badger' Enabled: 1 _CompDescription: Officially supported Component: restricted @@ -34,13 +68,47 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: dapper-updates +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/ -_Description: Ubuntu 6.06 LTS Updates +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 -_CompDescription: Officially supported +_CompDescription: Oficially supported Component: restricted Enabled: 1 _CompDescription: Restricted copyright @@ -51,13 +119,47 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: dapper-backports +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/ -_Description: Ubuntu 6.06 LTS Backports +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 -_CompDescription: Officially supported +_CompDescription: Oficially supported Component: restricted Enabled: 1 _CompDescription: Restricted copyright @@ -68,3 +170,35 @@ 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 -- cgit v1.2.3 From 34bb7b2d05692dbaab36dbad43d4b4305e0ff905 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Thu, 29 Jun 2006 00:52:16 +0200 Subject: * fixed test output of DistInfo and channels desc for Ubuntu --- SoftwareProperties/SoftwareProperties.py | 5 +++++ UpdateManager/Common/DistInfo.py | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'UpdateManager') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 037f01fb..e0d5f524 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -56,6 +56,11 @@ CONF_MAP = { "max_age" : "APT::Archives::MaxAge" } +( +COLUMN_ACTIVE, +COLUMN_DESC +) = range(2) + # columns of the source_store (SORE_ACTIVE, STORE_DESCRIPTION, STORE_SOURCE, STORE_SEPARATOR) = range(4) diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 873d7132..ebf83516 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -135,8 +135,8 @@ if __name__ == "__main__": print "BaseURI: %s" % suite.base_uri print "MatchURI: %s" % suite.match_uri for component in suite.components: - print " %s - %s - %s " % (component.name, - component.description, - component.enabled) + print " %s - %s - %s " % (component, + suite.components[component][0], + suite.components[component][1]) for child in suite.children: print " %s" % child.description -- cgit v1.2.3 From 972a8ca2f1ff4466096505262305260bbd507caf Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Thu, 29 Jun 2006 13:48:14 +0200 Subject: * add long descriptions for components * fix some boolean stuff (hide distru sources) * also rename the menu entry of the app --- SoftwareProperties/SoftwareProperties.py | 20 +++++++++++--------- UpdateManager/Common/DistInfo.py | 21 ++++++++++++++------- channels/Ubuntu.info.in | 14 +++++++++----- data/software-properties.desktop.in | 6 +++--- 4 files changed, 37 insertions(+), 24 deletions(-) (limited to 'UpdateManager') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 0f4f5f66..da52b272 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -31,6 +31,7 @@ import tempfile from gettext import gettext as _ import os import string +import re #sys.path.append("@prefix/share/update-manager/python") @@ -120,6 +121,7 @@ class Distribution: break if self.source_template == None: print "Error: could not find a distribution template" + # FIXME: will go away - only for debugging issues sys.exit(1) # find main and child sources @@ -141,9 +143,6 @@ class Distribution: print "yeah! child found: %s" % source.template.name if source.type == "deb": self.child_sources.append(source) - media.append(source.uri) - elif source.type == "deb-src": - self.source_code_sources.append(source) self.enabled_comps = set(comps) self.used_media = set(media) @@ -174,8 +173,8 @@ class Distribution: else: # seems to be a network source self.use_internet = True - if medium != self.main_server or \ - medium != self.nearest_server: + if not re.match(medium, self.main_server) and \ + not re.match(medium, self.nearest_server): self.other_servers.append(medium) @@ -338,7 +337,7 @@ class SoftwareProperties(SimpleGladeApp): for checkbutton in self.vbox_dist_comps.get_children(): self.vbox_dist_comps.remove(checkbutton) for comp in self.distribution.source_template.components.keys(): - checkbox = gtk.CheckButton(label=self.distribution.source_template.components[comp][0]) + checkbox = gtk.CheckButton(label=self.distribution.source_template.components[comp][2]) # check if the comp is enabled # FIXME: use inconsistence if there are main sources with not all comps if comp in self.distribution.enabled_comps: @@ -395,6 +394,8 @@ class SoftwareProperties(SimpleGladeApp): cell = gtk.CellRendererText() self.combobox_server.pack_start(cell, True) self.combobox_server.add_attribute(cell, 'text', 0) + # load the mirror list in to the combo and select the one of the first + # main source server_store.append([_("%s (default)") % self.distribution.main_server, self.distribution.main_server]) server_store.append([_("%s (nearest)") % self.distribution.nearest_server, @@ -557,7 +558,8 @@ class SoftwareProperties(SimpleGladeApp): if source.template.child == False: for comp in source.comps: if source.template.components.has_key(comp): - (desc, enabled) = source.template.components[comp] + print source.template.components[comp] + (desc, enabled, desc_long) = source.template.components[comp] contents += "\n%s" % desc else: contents += "\n%s" % comp @@ -591,8 +593,8 @@ class SoftwareProperties(SimpleGladeApp): self.sourceslist_visible=[] self.distribution.get_sources(self.sourceslist) for source in self.sourceslist.list: - if not source.invalid or\ - source not in self.distribution.main_sources or\ + if not source.invalid and\ + source not in self.distribution.main_sources and\ source not in self.distribution.child_sources: self.sourceslist_visible.append(source) diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index ebf83516..7d2d37ad 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -43,8 +43,9 @@ class Suite: class Component: def __init__(self): - self.name = None - self.description = None + self.name = "" + self.description = "" + self.description_long = "" self.enabled = None class DistInfo: @@ -82,7 +83,8 @@ class DistInfo: if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled) + (component.description, component.enabled, + component.description_long) component = None self.suites.append (suite) suite = Suite () @@ -110,17 +112,21 @@ class DistInfo: elif field == 'Component': if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled) + (component.description, component.enabled, + component.description_long) component = Component () component.name = value elif field == 'Enabled': component.enabled = bool(int(value)) elif field == 'CompDescription': component.description = _(value) + elif field == 'CompDescriptionLong': + component.description_long = _(value) if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled) + (component.description, component.enabled, + component.description_long) component = None self.suites.append (suite) suite = None @@ -135,8 +141,9 @@ if __name__ == "__main__": print "BaseURI: %s" % suite.base_uri print "MatchURI: %s" % suite.match_uri for component in suite.components: - print " %s - %s - %s " % (component, + print " %s - %s - %s - %s" % (component, suite.components[component][0], - suite.components[component][1]) + suite.components[component][1], + suite.components[component][2]) for child in suite.children: print " %s" % child.description diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index eb88ceb9..f92d8b8b 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -8,15 +8,19 @@ _Description: Ubuntu 6.04 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Officially supported -Component: restricted -Enabled: 1 -_CompDescription: Restricted copyright +_CompDescriptionLong: Free software that is officially supported by Canonical Ltd. (main) Component: universe Enabled: 0 -_CompDescription: Community maintained (Universe) +_CompDescription: Community maintained (universe) +_CompDescriptionLong: Free software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +_CompDescription: Non-free drivers +_CompDescriptionLong: Non-free drivers for devices (restricted) Component: multiverse Enabled: 0 -_CompDescription: Non-free (Multiverse) +_CompDescription: Restricted software (Multiverse) +_CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) Suite: dapper MatchName: .* diff --git a/data/software-properties.desktop.in b/data/software-properties.desktop.in index c125b4f7..330fc8bc 100644 --- a/data/software-properties.desktop.in +++ b/data/software-properties.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Software Properties -_GenericName=Software Properties -_Comment=Configure software channels and internet updates +_Name=Software Sources +_GenericName=Software Sources +_Comment=Configure the sources for installable software and updates Exec=gksu /usr/bin/software-properties Icon=software-properties Terminal=false -- cgit v1.2.3 From 372e249cb7ca0f7da468786f1d643cfc3905ffc6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 31 Jul 2006 23:39:48 +0200 Subject: * moved aptsources into the Common directory --- DistUpgrade/DistUpgrade.glade | 2 +- DistUpgrade/build-tarball.sh | 2 +- SoftwareProperties/SoftwareProperties.py | 2 +- SoftwareProperties/aptsources.py | 665 ------------------------------ UpdateManager/Common/aptsources.py | 666 +++++++++++++++++++++++++++++++ po/ar.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/br.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_AU.po | 2 +- po/en_CA.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/fur.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mk.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/no.po | 2 +- po/oc.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/rw.po | 2 +- po/sk.po | 2 +- po/sr.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/update-manager.pot | 2 +- po/ur.po | 2 +- po/urd.po | 2 +- po/vi.po | 2 +- po/xh.po | 2 +- po/zh_CN.po | 2 +- po/zh_HK.po | 2 +- po/zh_TW.po | 2 +- software-properties | 2 +- 62 files changed, 726 insertions(+), 725 deletions(-) delete mode 100644 SoftwareProperties/aptsources.py create mode 100644 UpdateManager/Common/aptsources.py (limited to 'UpdateManager') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 91d5b33f..a31df120 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -38,7 +38,7 @@ True - <span weight="bold" size="x-large">Upgrading to Ubuntu 6.06 LTS</span> + <span weight="bold" size="x-large">Upgrading to Ubuntu 6.10</span> False True GTK_JUSTIFY_LEFT diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index a30e40a0..4f88b848 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIST=dapper +DIST=edgy # cleanup rm -f *~ *.bak *.pyc *.moved '#'* diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 35793151..18e5d260 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -38,7 +38,7 @@ import re from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp from UpdateManager.Common.HelpViewer import HelpViewer -import aptsources +import UpdateManager.Common.aptsources as aptsources import dialog_add import dialog_edit import dialog_cache_outdated diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py deleted file mode 100644 index a4d16fa0..00000000 --- a/SoftwareProperties/aptsources.py +++ /dev/null @@ -1,665 +0,0 @@ -# aptsource.py.in - parse sources.list -# -# Copyright (c) 2004,2005 Canonical -# 2004 Michiel Sikkes -# -# Author: Michiel Sikkes -# Michael Vogt -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -import string -import gettext -import re -import apt_pkg -import glob -import shutil -import time -import os.path - -#import pdb - -from UpdateManager.Common.DistInfo import DistInfo - - -# some global helpers -def is_mirror(master_uri, compare_uri): - """check if the given add_url is idential or a mirror of orig_uri - e.g. master_uri = archive.ubuntu.com - compare_uri = de.archive.ubuntu.com - -> True - """ - # remove traling spaces and "/" - compare_uri = compare_uri.rstrip("/ ") - master_uri = master_uri.rstrip("/ ") - # uri is identical - if compare_uri == master_uri: - #print "Identical" - return True - # add uri is a master site and orig_uri has the from "XX.mastersite" - # (e.g. de.archive.ubuntu.com) - try: - compare_srv = compare_uri.split("//")[1] - master_srv = master_uri.split("//")[1] - #print "%s == %s " % (add_srv, orig_srv) - except IndexError: # ok, somethings wrong here - #print "IndexError" - return False - # remove the leading "." (if any) and see if that helps - if "." in compare_srv and \ - compare_srv[compare_srv.index(".")+1:] == master_srv: - #print "Mirror" - return True - return False - -def uniq(s): - """ simple and efficient way to return uniq list """ - return list(set(s)) - - - -# actual source.list entries -class SourceEntry: - - def __init__(self, line,file=None): - self.invalid = False - self.disabled = False - self.type = "" - self.uri = "" - self.dist = "" - self.comps = [] - self.comment = "" - self.line = line - if file == None: - file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") - self.file = file - self.parse(line) - self.template = None - self.children = [] - - # works mostely like split but takes [] into account - def mysplit(self, line): - line = string.strip(line) - pieces = [] - tmp = "" - # we are inside a [..] block - p_found = False - space_found = False - for i in range(len(line)): - if line[i] == "[": - p_found=True - tmp += line[i] - elif line[i] == "]": - p_found=False - tmp += line[i] - elif space_found and not line[i].isspace(): # we skip one or more space - space_found = False - pieces.append(tmp) - tmp = line[i] - elif line[i].isspace() and not p_found: # found a whitespace - space_found = True - else: - tmp += line[i] - # append last piece - if len(tmp) > 0: - pieces.append(tmp) - return pieces - - - # parse a given source line and split it into the fields we need - def parse(self,line): - line = string.strip(self.line) - #print line - # check if the source is enabled/disabled - if line == "" or line == "#": # empty line - self.invalid = True - return - if line[0] == "#": - self.disabled = True - pieces = string.split(line[1:]) - # if it looks not like a disabled deb line return - if not (pieces[0] == "deb" or pieces[0] == "deb-src"): - self.invalid = True - return - else: - line = line[1:] - # check for another "#" in the line (this is treated as a comment) - i = line.find("#") - if i > 0: - self.comment = line[i+1:] - line = line[:i] - # source is ok, split it and see what we have - pieces = self.mysplit(line) - # Sanity check - if len(pieces) < 3: - self.invalid = True - return - # Type, deb or deb-src - self.type = string.strip(pieces[0]) - # Sanity check - if self.type not in ("deb", "deb-src"): - self.invalid = True - return - # URI - self.uri = string.strip(pieces[1]) - if len(self.uri) < 1: - self.invalid = True - # distro and components (optional) - # Directory or distro - self.dist = string.strip(pieces[2]) - if len(pieces) > 3: - # List of components - self.comps = pieces[3:] - else: - self.comps = [] - - #print self.__dict__ - - - # set enabled/disabled - def set_enabled(self, new_value): - self.disabled = not new_value - # enable, remove all "#" from the start of the line - if new_value == True: - i=0 - self.line = string.lstrip(self.line) - while self.line[i] == "#": - i += 1 - self.line = self.line[i:] - else: - # disabled, add a "#" - if string.strip(self.line)[0] != "#": - self.line = "#" + self.line - - def __str__(self): - """ debug helper """ - return self.str().strip() - - def str(self): - """ return the current line as string """ - if self.invalid: - return self.line - line = "" - if self.disabled: - line = "# " - line += "%s %s %s" % (self.type, self.uri, self.dist) - if len(self.comps) > 0: - line += " " + " ".join(self.comps) - if self.comment != "": - line += " #"+self.comment - line += "\n" - return line - -# the SourceList file as a class -class SourcesList: - def __init__(self): - self.list = [] # of Type SourceEntries - self.matcher = SourceEntryMatcher() - self.refresh() - - def refresh(self): - self.list = [] - # read sources.list - dir = apt_pkg.Config.FindDir("Dir::Etc") - file = apt_pkg.Config.Find("Dir::Etc::sourcelist") - self.load(dir+file) - # read sources.list.d - partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") - for file in glob.glob("%s/*.list" % partsdir): - self.load(file) - # check if the source item fits a predefined template - for source in self.list: - if source.invalid == False: - self.matcher.match(source) - - def __iter__(self): - for entry in self.list: - yield entry - raise StopIteration - - def add(self, type, uri, dist, comps, comment="", pos=-1, file=None): - """ - Add a new source to the sources.list. - The method will search for existing matching repos and will try to - reuse them as far as possible - """ - for source in self.list: - # if there is a repo with the same (type, uri, dist) just add the - # components - if source.disabled == False and source.invalid == False and \ - source.type == type and uri == source.uri and \ - source.dist == dist: - comps = uniq(source.comps + comps) - source.comps = comps - return source - # if there is a corresponding repo which is disabled, enable it - elif source.disabled == True and source.invalid == False and \ - source.type == type and uri == source.uri and \ - source.dist == dist and \ - len(set(source.comps) & set(comps)) == len(comps): - source.disabled = False - return source - # there isn't any matching source, so create a new line and parse it - line = "%s %s %s" % (type,uri,dist) - for c in comps: - line = line + " " + c; - if comment != "": - line = "%s #%s\n" %(line,comment) - line = line + "\n" - new_entry = SourceEntry(line) - if file != None: - new_entry.file = file - self.matcher.match(new_entry) - self.list.insert(pos, new_entry) - return new_entry - - def remove(self, source_entry): - self.list.remove(source_entry) - - def restoreBackup(self, backup_ext): - " restore sources.list files based on the backup extension " - dir = apt_pkg.Config.FindDir("Dir::Etc") - file = apt_pkg.Config.Find("Dir::Etc::sourcelist") - if os.path.exists(dir+file+backup_ext): - shutil.copy(dir+file+backup_ext,dir+file) - # now sources.list.d - partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") - for file in glob.glob("%s/*.list" % partsdir): - if os.path.exists(file+backup_ext): - shutil.copy(file+backup_ext,file) - - def backup(self, backup_ext=None): - """ make a backup of the current source files, if no backup extension - is given, the current date/time is used (and returned) """ - already_backuped = set() - if backup_ext == None: - backup_ext = time.strftime("%y%m%d.%H%M") - for source in self.list: - if not source.file in already_backuped: - shutil.copy(source.file,"%s%s" % (source.file,backup_ext)) - return backup_ext - - def load(self,file): - """ (re)load the current sources """ - try: - f = open(file, "r") - lines = f.readlines() - for line in lines: - source = SourceEntry(line,file) - self.list.append(source) - except: - print "could not open file '%s'" % file - else: - f.close() - - def save(self): - """ save the current sources """ - files = {} - for source in self.list: - if not files.has_key(source.file): - files[source.file]=open(source.file,"w") - files[source.file].write(source.str()) - for f in files: - files[f].close() - - def check_for_relations(self, sources_list): - """get all parent and child channels in the sources list""" - parents = [] - used_child_templates = {} - for source in sources_list: - # try to avoid checking uninterressting sources - if source.template == None: - continue - # set up a dict with all used child templates and corresponding - # source entries - if source.template.child == True: - key = source.template - if not used_child_templates.has_key(key): - used_child_templates[key] = [] - temp = used_child_templates[key] - temp.append(source) - else: - # store each source with children aka. a parent :) - if len(source.template.children) > 0: - parents.append(source) - #print self.used_child_templates - #print self.parents - return (parents, used_child_templates) - -# templates for the add dialog -class SourceEntryTemplate(SourceEntry): - def __init__(self,a_type,uri,dist,description,comps): - self.comps_descriptions = [] - self.type = a_type - self.uri = uri - self.dist = dist - self.description = description - self.comps = comps - - def matches(self,source_entry): - """ check if a given source_entry matches this one """ - if (self.type != source_entry.type): - return False - if (self.dist != source_entry.dist): - return False - if not is_mirror(self.uri,source_entry.uri): - return False - for e_comp in source_entry.comps: - for t_comp in self.comps: - if e_comp == t_comp.name: break - else: - return False - return True - -class SourceCompTemplate: - def __init__(self, name, description, on_by_default): - self.name = name - self.description = description - self.on_by_default = on_by_default - -class SourceEntryTemplates: - def __init__(self,datadir): - _ = gettext.gettext - self.templates = [] - - dinfo = DistInfo (base_dir=datadir+"channels/") - - for suite in dinfo.suites: - comps = [] - for comp in suite.components: - comps.append(SourceCompTemplate(comp.name, _(comp.description), - comp.enabled)) - self.templates.append (SourceEntryTemplate(suite.repository_type, - suite.base_uri, - suite.name, - suite.description, - comps)) - -# matcher class to make a source entry look nice -# lots of predefined matchers to make it i18n/gettext friendly -class SourceEntryMatcher: - class MatchType: - def __init__(self, a_type,a_descr): - self.type = a_type - self.description = a_descr - - class MatchDist: - def __init__(self,a_uri,a_dist, a_descr,l_comps, l_comps_descr): - self.uri = a_uri - self.dist = a_dist - self.description = a_descr - self.comps = l_comps - self.comps_descriptions = l_comps_descr - - def __init__(self): - self.templates = [] - # Get the human readable channel and comp names from the channel .infos - spec_files = glob.glob("/usr/share/update-manager/channels/*.info") - for f in spec_files: - f = os.path.basename(f) - i = f.find(".info") - f = f[0:i] - dist = DistInfo(f) - for suite in dist.suites: - if suite.match_uri != None: - self.templates.append(suite) - return - - def match(self, source): - """Add a matching template to the source""" - _ = gettext.gettext - found = False - for template in self.templates: - #print "'%s'" %source.uri - if re.search(template.match_uri, source.uri) and \ - re.match(template.match_name, source.dist): - found = True - source.template = template - break - return found - -class Distribution: - def __init__(self): - """" - Container for distribution specific informations - """ - # LSB information - self.id = "" - self.codename = "" - self.description = "" - self.release = "" - - # get the LSB information - lsb_info = [] - for lsb_option in ["-i", "-c", "-d", "-r"]: - pipe = os.popen("lsb_release %s | cut -d : -f 2-" % lsb_option) - lsb_info.append(pipe.read().strip()) - del pipe - (self.id, self.codename, self.description, self.release) = lsb_info - - # get a list of country codes and real names - self.countries = {} - try: - f = open("/usr/share/iso-codes/iso_3166.tab", "r") - lines = f.readlines() - for line in lines: - parts = line.split("\t") - self.countries[parts[0].lower()] = parts[1] - except: - print "could not open file '%s'" % file - else: - f.close() - - def get_sources(self, sources_list): - """ - Find the corresponding template, main and child sources - for the distribution - """ - # corresponding sources - self.source_template = None - self.child_sources = [] - self.main_sources = [] - self.disabled_sources = [] - self.cdrom_sources = [] - self.download_comps = [] - self.enabled_comps = [] - self.cdrom_comps = [] - self.used_media = [] - self.get_source_code = False - self.source_code_sources = [] - - # location of the sources - self.default_server = "" - self.main_server = "" - self.nearest_server = "" - self.used_servers = [] - - # find the distro template - for template in sources_list.matcher.templates: - if template.name == self.codename and\ - template.distribution == self.id: - #print "yeah! found a template for %s" % self.description - #print template.description, template.base_uri, template.components - self.source_template = template - break - if self.source_template == None: - print "Error: could not find a distribution template" - # FIXME: will go away - only for debugging issues - sys.exit(1) - - # find main and child sources - media = [] - comps = [] - cdrom_comps = [] - enabled_comps = [] - source_code = [] - for source in sources_list.list: - if source.invalid == False and\ - source.dist == self.codename and\ - source.template and\ - source.template.name == self.codename: - #print "yeah! found a distro repo: %s" % source.line - # cdroms need do be handled differently - if source.uri.startswith("cdrom:") and \ - source.disabled == False: - self.cdrom_sources.append(source) - cdrom_comps.extend(source.comps) - elif source.uri.startswith("cdrom:") and \ - source.disabled == True: - self.cdrom_sources.append(source) - elif source.type == "deb" and source.disabled == False: - self.main_sources.append(source) - comps.extend(source.comps) - media.append(source.uri) - elif source.type == "deb" and source.disabled == True: - self.disabled_sources.append(source) - elif source.type.endswith("-src") and source.disabled == False: - self.source_code_sources.append(source) - elif source.type.endswith("-src") and source.disabled == True: - self.disabled_sources.append(source) - if source.template in self.source_template.children: - #print "yeah! child found: %s" % source.template.name - if source.type == "deb": - self.child_sources.append(source) - elif source.type == "deb-src": - self.source_code_sources.append(source) - self.download_comps = set(comps) - self.cdrom_comps = set(cdrom_comps) - enabled_comps.extend(comps) - enabled_comps.extend(cdrom_comps) - self.enabled_comps = set(enabled_comps) - self.used_media = set(media) - - self.get_mirrors() - - def get_mirrors(self): - """ - Provide a set of mirrors where you can get the distribution from - """ - # the main server is stored in the template - self.main_server = self.source_template.base_uri - - # try to guess the nearest mirror from the locale - # FIXME: for debian we need something different - if self.id == "Ubuntu": - locale = os.getenv("LANG", default="en.UK") - a = locale.find("_") - z = locale.find(".") - if z == -1: - z = len(locale) - country_code = locale[a+1:z].lower() - self.nearest_server = "http://%s.archive.ubuntu.com/ubuntu/" % \ - country_code - if self.countries.has_key(country_code): - self.country = self.countries[country_code] - else: - self.country = None - - # other used servers - for medium in self.used_media: - if not medium.startswith("cdrom:"): - # seems to be a network source - self.used_servers.append(medium) - - if len(self.main_sources) == 0: - self.default_server = self.main_server - else: - self.default_server = self.main_sources[0].uri - - def add_source(self, sources_list, type=None, - uri=None, dist=None, comps=None, comment=""): - """ - Add distribution specific sources - """ - if uri == None: - # FIXME: Add support for the server selector - uri = self.default_server - if dist == None: - dist = self.codename - if comps == None: - comps = list(self.enabled_comps) - if type == None: - type = "deb" - if comment == "": - comment == "Added by software-properties" - new_source = sources_list.add(type, uri, dist, comps, comment) - # if source code is enabled add a deb-src line after the new - # source - if self.get_source_code == True and not type.endswith("-src"): - sources_list.add("%s-src" % type, uri, dist, comps, comment, - file=new_source.file, - pos=sources_list.list.index(new_source)+1) - - def enable_component(self, sourceslist, comp): - """ - Disable a component in all main, child and source code sources - (excluding cdrom based sources) - - sourceslist: an aptsource.sources_list - comp: the component that should be enabled - """ - sources = [] - sources.extend(self.main_sources) - sources.extend(self.child_sources) - sources.extend(self.source_code_sources) - # check if there is a main source at all - if len(self.main_sources) < 1: - # create a new main source - self.add_source(sourceslist, comps=["%s"%comp]) - else: - # add the comp to all main, child and source code sources - for source in sources: - if comp not in source.comps: - source.comps.append(comp) - if self.get_source_code == True: - for source in self.source_code_sources: - if comp not in source.comps: source.comps.append(comp) - - def disable_component(self, sourceslist, comp): - """ - Disable a component in all main, child and source code sources - (excluding cdrom based sources) - """ - sources = [] - sources.extend(self.main_sources) - sources.extend(self.child_sources) - sources.extend(self.source_code_sources) - if comp in self.cdrom_comps: - sources = [] - sources.extend(self.main_sources) - - for source in sources: - if comp in source.comps: - source.comps.remove(comp) - if len(source.comps) < 1: - sourceslist.remove(source) - - -# some simple tests -if __name__ == "__main__": - apt_pkg.InitConfig() - sources = SourcesList() - - for entry in sources: - print entry.str() - #print entry.uri - - mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", - "http://de.archive.ubuntu.com/ubuntu/") - print "is_mirror(): %s" % mirror - - print is_mirror("http://archive.ubuntu.com/ubuntu", - "http://de.archive.ubuntu.com/ubuntu/") diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py new file mode 100644 index 00000000..fce06c2b --- /dev/null +++ b/UpdateManager/Common/aptsources.py @@ -0,0 +1,666 @@ +# aptsource.py.in - parse sources.list +# +# Copyright (c) 2004,2005 Canonical +# 2004 Michiel Sikkes +# +# Author: Michiel Sikkes +# Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import string +import gettext +import re +import apt_pkg +import glob +import shutil +import time +import os.path + +#import pdb + +from UpdateManager.Common.DistInfo import DistInfo + + +# some global helpers +def is_mirror(master_uri, compare_uri): + """check if the given add_url is idential or a mirror of orig_uri + e.g. master_uri = archive.ubuntu.com + compare_uri = de.archive.ubuntu.com + -> True + """ + # remove traling spaces and "/" + compare_uri = compare_uri.rstrip("/ ") + master_uri = master_uri.rstrip("/ ") + # uri is identical + if compare_uri == master_uri: + #print "Identical" + return True + # add uri is a master site and orig_uri has the from "XX.mastersite" + # (e.g. de.archive.ubuntu.com) + try: + compare_srv = compare_uri.split("//")[1] + master_srv = master_uri.split("//")[1] + #print "%s == %s " % (add_srv, orig_srv) + except IndexError: # ok, somethings wrong here + #print "IndexError" + return False + # remove the leading "." (if any) and see if that helps + if "." in compare_srv and \ + compare_srv[compare_srv.index(".")+1:] == master_srv: + #print "Mirror" + return True + return False + +def uniq(s): + """ simple and efficient way to return uniq list """ + return list(set(s)) + + + +# actual source.list entries +class SourceEntry: + + def __init__(self, line,file=None): + self.invalid = False + self.disabled = False + self.type = "" + self.uri = "" + self.dist = "" + self.comps = [] + self.comment = "" + self.line = line + if file == None: + file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") + self.file = file + self.parse(line) + self.template = None + self.children = [] + + # works mostely like split but takes [] into account + def mysplit(self, line): + line = string.strip(line) + pieces = [] + tmp = "" + # we are inside a [..] block + p_found = False + space_found = False + for i in range(len(line)): + if line[i] == "[": + p_found=True + tmp += line[i] + elif line[i] == "]": + p_found=False + tmp += line[i] + elif space_found and not line[i].isspace(): # we skip one or more space + space_found = False + pieces.append(tmp) + tmp = line[i] + elif line[i].isspace() and not p_found: # found a whitespace + space_found = True + else: + tmp += line[i] + # append last piece + if len(tmp) > 0: + pieces.append(tmp) + return pieces + + + # parse a given source line and split it into the fields we need + def parse(self,line): + line = string.strip(self.line) + #print line + # check if the source is enabled/disabled + if line == "" or line == "#": # empty line + self.invalid = True + return + if line[0] == "#": + self.disabled = True + pieces = string.split(line[1:]) + # if it looks not like a disabled deb line return + if not (pieces[0] == "deb" or pieces[0] == "deb-src"): + self.invalid = True + return + else: + line = line[1:] + # check for another "#" in the line (this is treated as a comment) + i = line.find("#") + if i > 0: + self.comment = line[i+1:] + line = line[:i] + # source is ok, split it and see what we have + pieces = self.mysplit(line) + # Sanity check + if len(pieces) < 3: + self.invalid = True + return + # Type, deb or deb-src + self.type = string.strip(pieces[0]) + # Sanity check + if self.type not in ("deb", "deb-src"): + self.invalid = True + return + # URI + self.uri = string.strip(pieces[1]) + if len(self.uri) < 1: + self.invalid = True + # distro and components (optional) + # Directory or distro + self.dist = string.strip(pieces[2]) + if len(pieces) > 3: + # List of components + self.comps = pieces[3:] + else: + self.comps = [] + + #print self.__dict__ + + + # set enabled/disabled + def set_enabled(self, new_value): + self.disabled = not new_value + # enable, remove all "#" from the start of the line + if new_value == True: + i=0 + self.line = string.lstrip(self.line) + while self.line[i] == "#": + i += 1 + self.line = self.line[i:] + else: + # disabled, add a "#" + if string.strip(self.line)[0] != "#": + self.line = "#" + self.line + + def __str__(self): + """ debug helper """ + return self.str().strip() + + def str(self): + """ return the current line as string """ + if self.invalid: + return self.line + line = "" + if self.disabled: + line = "# " + line += "%s %s %s" % (self.type, self.uri, self.dist) + if len(self.comps) > 0: + line += " " + " ".join(self.comps) + if self.comment != "": + line += " #"+self.comment + line += "\n" + return line + +# the SourceList file as a class +class SourcesList: + def __init__(self, withMatcher=True): + self.list = [] # of Type SourceEntries + if withMatcher: + self.matcher = SourceEntryMatcher() + self.refresh() + + def refresh(self): + self.list = [] + # read sources.list + dir = apt_pkg.Config.FindDir("Dir::Etc") + file = apt_pkg.Config.Find("Dir::Etc::sourcelist") + self.load(dir+file) + # read sources.list.d + partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + self.load(file) + # check if the source item fits a predefined template + for source in self.list: + if source.invalid == False: + self.matcher.match(source) + + def __iter__(self): + for entry in self.list: + yield entry + raise StopIteration + + def add(self, type, uri, dist, comps, comment="", pos=-1, file=None): + """ + Add a new source to the sources.list. + The method will search for existing matching repos and will try to + reuse them as far as possible + """ + for source in self.list: + # if there is a repo with the same (type, uri, dist) just add the + # components + if source.disabled == False and source.invalid == False and \ + source.type == type and uri == source.uri and \ + source.dist == dist: + comps = uniq(source.comps + comps) + source.comps = comps + return source + # if there is a corresponding repo which is disabled, enable it + elif source.disabled == True and source.invalid == False and \ + source.type == type and uri == source.uri and \ + source.dist == dist and \ + len(set(source.comps) & set(comps)) == len(comps): + source.disabled = False + return source + # there isn't any matching source, so create a new line and parse it + line = "%s %s %s" % (type,uri,dist) + for c in comps: + line = line + " " + c; + if comment != "": + line = "%s #%s\n" %(line,comment) + line = line + "\n" + new_entry = SourceEntry(line) + if file != None: + new_entry.file = file + self.matcher.match(new_entry) + self.list.insert(pos, new_entry) + return new_entry + + def remove(self, source_entry): + self.list.remove(source_entry) + + def restoreBackup(self, backup_ext): + " restore sources.list files based on the backup extension " + dir = apt_pkg.Config.FindDir("Dir::Etc") + file = apt_pkg.Config.Find("Dir::Etc::sourcelist") + if os.path.exists(dir+file+backup_ext): + shutil.copy(dir+file+backup_ext,dir+file) + # now sources.list.d + partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + if os.path.exists(file+backup_ext): + shutil.copy(file+backup_ext,file) + + def backup(self, backup_ext=None): + """ make a backup of the current source files, if no backup extension + is given, the current date/time is used (and returned) """ + already_backuped = set() + if backup_ext == None: + backup_ext = time.strftime("%y%m%d.%H%M") + for source in self.list: + if not source.file in already_backuped: + shutil.copy(source.file,"%s%s" % (source.file,backup_ext)) + return backup_ext + + def load(self,file): + """ (re)load the current sources """ + try: + f = open(file, "r") + lines = f.readlines() + for line in lines: + source = SourceEntry(line,file) + self.list.append(source) + except: + print "could not open file '%s'" % file + else: + f.close() + + def save(self): + """ save the current sources """ + files = {} + for source in self.list: + if not files.has_key(source.file): + files[source.file]=open(source.file,"w") + files[source.file].write(source.str()) + for f in files: + files[f].close() + + def check_for_relations(self, sources_list): + """get all parent and child channels in the sources list""" + parents = [] + used_child_templates = {} + for source in sources_list: + # try to avoid checking uninterressting sources + if source.template == None: + continue + # set up a dict with all used child templates and corresponding + # source entries + if source.template.child == True: + key = source.template + if not used_child_templates.has_key(key): + used_child_templates[key] = [] + temp = used_child_templates[key] + temp.append(source) + else: + # store each source with children aka. a parent :) + if len(source.template.children) > 0: + parents.append(source) + #print self.used_child_templates + #print self.parents + return (parents, used_child_templates) + +# templates for the add dialog +class SourceEntryTemplate(SourceEntry): + def __init__(self,a_type,uri,dist,description,comps): + self.comps_descriptions = [] + self.type = a_type + self.uri = uri + self.dist = dist + self.description = description + self.comps = comps + + def matches(self,source_entry): + """ check if a given source_entry matches this one """ + if (self.type != source_entry.type): + return False + if (self.dist != source_entry.dist): + return False + if not is_mirror(self.uri,source_entry.uri): + return False + for e_comp in source_entry.comps: + for t_comp in self.comps: + if e_comp == t_comp.name: break + else: + return False + return True + +class SourceCompTemplate: + def __init__(self, name, description, on_by_default): + self.name = name + self.description = description + self.on_by_default = on_by_default + +class SourceEntryTemplates: + def __init__(self,datadir): + _ = gettext.gettext + self.templates = [] + + dinfo = DistInfo (base_dir=datadir+"channels/") + + for suite in dinfo.suites: + comps = [] + for comp in suite.components: + comps.append(SourceCompTemplate(comp.name, _(comp.description), + comp.enabled)) + self.templates.append (SourceEntryTemplate(suite.repository_type, + suite.base_uri, + suite.name, + suite.description, + comps)) + +# matcher class to make a source entry look nice +# lots of predefined matchers to make it i18n/gettext friendly +class SourceEntryMatcher: + class MatchType: + def __init__(self, a_type,a_descr): + self.type = a_type + self.description = a_descr + + class MatchDist: + def __init__(self,a_uri,a_dist, a_descr,l_comps, l_comps_descr): + self.uri = a_uri + self.dist = a_dist + self.description = a_descr + self.comps = l_comps + self.comps_descriptions = l_comps_descr + + def __init__(self): + self.templates = [] + # Get the human readable channel and comp names from the channel .infos + spec_files = glob.glob("/usr/share/update-manager/channels/*.info") + for f in spec_files: + f = os.path.basename(f) + i = f.find(".info") + f = f[0:i] + dist = DistInfo(f) + for suite in dist.suites: + if suite.match_uri != None: + self.templates.append(suite) + return + + def match(self, source): + """Add a matching template to the source""" + _ = gettext.gettext + found = False + for template in self.templates: + #print "'%s'" %source.uri + if re.search(template.match_uri, source.uri) and \ + re.match(template.match_name, source.dist): + found = True + source.template = template + break + return found + +class Distribution: + def __init__(self): + """" + Container for distribution specific informations + """ + # LSB information + self.id = "" + self.codename = "" + self.description = "" + self.release = "" + + # get the LSB information + lsb_info = [] + for lsb_option in ["-i", "-c", "-d", "-r"]: + pipe = os.popen("lsb_release %s | cut -d : -f 2-" % lsb_option) + lsb_info.append(pipe.read().strip()) + del pipe + (self.id, self.codename, self.description, self.release) = lsb_info + + # get a list of country codes and real names + self.countries = {} + try: + f = open("/usr/share/iso-codes/iso_3166.tab", "r") + lines = f.readlines() + for line in lines: + parts = line.split("\t") + self.countries[parts[0].lower()] = parts[1] + except: + print "could not open file '%s'" % file + else: + f.close() + + def get_sources(self, sources_list): + """ + Find the corresponding template, main and child sources + for the distribution + """ + # corresponding sources + self.source_template = None + self.child_sources = [] + self.main_sources = [] + self.disabled_sources = [] + self.cdrom_sources = [] + self.download_comps = [] + self.enabled_comps = [] + self.cdrom_comps = [] + self.used_media = [] + self.get_source_code = False + self.source_code_sources = [] + + # location of the sources + self.default_server = "" + self.main_server = "" + self.nearest_server = "" + self.used_servers = [] + + # find the distro template + for template in sources_list.matcher.templates: + if template.name == self.codename and\ + template.distribution == self.id: + #print "yeah! found a template for %s" % self.description + #print template.description, template.base_uri, template.components + self.source_template = template + break + if self.source_template == None: + print "Error: could not find a distribution template" + # FIXME: will go away - only for debugging issues + sys.exit(1) + + # find main and child sources + media = [] + comps = [] + cdrom_comps = [] + enabled_comps = [] + source_code = [] + for source in sources_list.list: + if source.invalid == False and\ + source.dist == self.codename and\ + source.template and\ + source.template.name == self.codename: + #print "yeah! found a distro repo: %s" % source.line + # cdroms need do be handled differently + if source.uri.startswith("cdrom:") and \ + source.disabled == False: + self.cdrom_sources.append(source) + cdrom_comps.extend(source.comps) + elif source.uri.startswith("cdrom:") and \ + source.disabled == True: + self.cdrom_sources.append(source) + elif source.type == "deb" and source.disabled == False: + self.main_sources.append(source) + comps.extend(source.comps) + media.append(source.uri) + elif source.type == "deb" and source.disabled == True: + self.disabled_sources.append(source) + elif source.type.endswith("-src") and source.disabled == False: + self.source_code_sources.append(source) + elif source.type.endswith("-src") and source.disabled == True: + self.disabled_sources.append(source) + if source.template in self.source_template.children: + #print "yeah! child found: %s" % source.template.name + if source.type == "deb": + self.child_sources.append(source) + elif source.type == "deb-src": + self.source_code_sources.append(source) + self.download_comps = set(comps) + self.cdrom_comps = set(cdrom_comps) + enabled_comps.extend(comps) + enabled_comps.extend(cdrom_comps) + self.enabled_comps = set(enabled_comps) + self.used_media = set(media) + + self.get_mirrors() + + def get_mirrors(self): + """ + Provide a set of mirrors where you can get the distribution from + """ + # the main server is stored in the template + self.main_server = self.source_template.base_uri + + # try to guess the nearest mirror from the locale + # FIXME: for debian we need something different + if self.id == "Ubuntu": + locale = os.getenv("LANG", default="en.UK") + a = locale.find("_") + z = locale.find(".") + if z == -1: + z = len(locale) + country_code = locale[a+1:z].lower() + self.nearest_server = "http://%s.archive.ubuntu.com/ubuntu/" % \ + country_code + if self.countries.has_key(country_code): + self.country = self.countries[country_code] + else: + self.country = None + + # other used servers + for medium in self.used_media: + if not medium.startswith("cdrom:"): + # seems to be a network source + self.used_servers.append(medium) + + if len(self.main_sources) == 0: + self.default_server = self.main_server + else: + self.default_server = self.main_sources[0].uri + + def add_source(self, sources_list, type=None, + uri=None, dist=None, comps=None, comment=""): + """ + Add distribution specific sources + """ + if uri == None: + # FIXME: Add support for the server selector + uri = self.default_server + if dist == None: + dist = self.codename + if comps == None: + comps = list(self.enabled_comps) + if type == None: + type = "deb" + if comment == "": + comment == "Added by software-properties" + new_source = sources_list.add(type, uri, dist, comps, comment) + # if source code is enabled add a deb-src line after the new + # source + if self.get_source_code == True and not type.endswith("-src"): + sources_list.add("%s-src" % type, uri, dist, comps, comment, + file=new_source.file, + pos=sources_list.list.index(new_source)+1) + + def enable_component(self, sourceslist, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + + sourceslist: an aptsource.sources_list + comp: the component that should be enabled + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + # check if there is a main source at all + if len(self.main_sources) < 1: + # create a new main source + self.add_source(sourceslist, comps=["%s"%comp]) + else: + # add the comp to all main, child and source code sources + for source in sources: + if comp not in source.comps: + source.comps.append(comp) + if self.get_source_code == True: + for source in self.source_code_sources: + if comp not in source.comps: source.comps.append(comp) + + def disable_component(self, sourceslist, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + if comp in self.cdrom_comps: + sources = [] + sources.extend(self.main_sources) + + for source in sources: + if comp in source.comps: + source.comps.remove(comp) + if len(source.comps) < 1: + sourceslist.remove(source) + + +# some simple tests +if __name__ == "__main__": + apt_pkg.InitConfig() + sources = SourcesList() + + for entry in sources: + print entry.str() + #print entry.uri + + mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu/") + print "is_mirror(): %s" % mirror + + print is_mirror("http://archive.ubuntu.com/ubuntu", + "http://de.archive.ubuntu.com/ubuntu/") diff --git a/po/ar.po b/po/ar.po index cbcf3459..b25550fa 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" diff --git a/po/bg.po b/po/bg.po index 83cf9797..de6df323 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" diff --git a/po/bn.po b/po/bn.po index 199defa6..dcd7a2fb 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" diff --git a/po/br.po b/po/br.po index d68c230c..784f625b 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" diff --git a/po/ca.po b/po/ca.po index f2987b80..6da4ed56 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 73071fc3..9387e60b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index aed71b7e..8d2981b1 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 51276339..412385d2 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" diff --git a/po/el.po b/po/el.po index 253457db..df431e8b 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" diff --git a/po/en_AU.po b/po/en_AU.po index 0cfccae4..983a7e36 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" diff --git a/po/en_CA.po b/po/en_CA.po index 6f6246f2..ea0eb274 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" diff --git a/po/en_GB.po b/po/en_GB.po index dcea5c7d..42f56e94 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" diff --git a/po/es.po b/po/es.po index 97430b97..8be24196 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" diff --git a/po/fi.po b/po/fi.po index b01d2588..4fb7509c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 519fef68..d3d1746a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" diff --git a/po/fur.po b/po/fur.po index 3c3aedae..256127d4 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" diff --git a/po/gl.po b/po/gl.po index e0da8cea..1370f0da 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" diff --git a/po/he.po b/po/he.po index d489f76d..2b3b0c3b 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" diff --git a/po/hi.po b/po/hi.po index 8d75639f..d0862c24 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" diff --git a/po/hr.po b/po/hr.po index 6082643e..85aa2a13 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" diff --git a/po/hu.po b/po/hu.po index fa0ec160..a124cc27 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index c15dbb90..6f8f1983 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" diff --git a/po/it.po b/po/it.po index b5004cf1..f61c58f9 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 7eca8a7a..448e8696 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" diff --git a/po/ka.po b/po/ka.po index 47e5af28..0e776ab9 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" diff --git a/po/ko.po b/po/ko.po index e2e9df5c..227b519f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" diff --git a/po/ku.po b/po/ku.po index 0bd54299..42644134 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" diff --git a/po/lt.po b/po/lt.po index 5bd29c07..0e5df421 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" diff --git a/po/mk.po b/po/mk.po index b98bde16..3ca8f9bb 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" diff --git a/po/ms.po b/po/ms.po index 7510b364..baba9a1a 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" diff --git a/po/nb.po b/po/nb.po index d4ce9cdf..0edbc0c9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" diff --git a/po/ne.po b/po/ne.po index 92d0bfd2..cbef83ef 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" diff --git a/po/nl.po b/po/nl.po index e99d3fb7..9efe0175 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" diff --git a/po/no.po b/po/no.po index 45e77058..1b04ca84 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" diff --git a/po/oc.po b/po/oc.po index c5f21fd3..a2209808 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" diff --git a/po/pa.po b/po/pa.po index 45b445c9..3e5fd974 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" diff --git a/po/pl.po b/po/pl.po index b3a03e01..b37d0d39 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 2144bab4..1e9fe9db 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3ab912a9..cb3c8c2c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" diff --git a/po/ro.po b/po/ro.po index 1e0d1589..e73adf0f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index e873db5a..c14af2cf 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" diff --git a/po/rw.po b/po/rw.po index 931052ca..abba200e 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" diff --git a/po/sk.po b/po/sk.po index acb12569..974215ac 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" diff --git a/po/sr.po b/po/sr.po index f6e75a7b..7a432396 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" diff --git a/po/sv.po b/po/sv.po index 6c187227..03fe3e20 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" diff --git a/po/th.po b/po/th.po index 9cf2d41a..d42d3b0f 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" diff --git a/po/tr.po b/po/tr.po index 8ffe6754..e8018237 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" diff --git a/po/uk.po b/po/uk.po index f996843e..322af381 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" diff --git a/po/update-manager.pot b/po/update-manager.pot index f2e00f38..897a7804 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ur.po b/po/ur.po index 18ebec55..3464b679 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" diff --git a/po/urd.po b/po/urd.po index 27d954c5..18e68cec 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" diff --git a/po/vi.po b/po/vi.po index 025b54ed..c03e91e0 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" diff --git a/po/xh.po b/po/xh.po index 86d1c4df..e519731a 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f78ebe5..d9e7edab 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 4322ad56..b89955ac 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0400bb12..5d0bb9d7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 18:12+0200\n" +"POT-Creation-Date: 2006-07-31 21:12+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" diff --git a/software-properties b/software-properties index 6c38d073..129c3085 100644 --- a/software-properties +++ b/software-properties @@ -34,7 +34,7 @@ import sys from optparse import OptionParser -import SoftwareProperties.aptsources as aptsources +import UpdateManager.Common.aptsources as aptsources #sys.path.append("@prefix@/share/update-manager/python") -- cgit v1.2.3 From cc6eb736ca4613d70c3f7ff30317af340ca70bb7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Aug 2006 00:04:31 +0200 Subject: * UpdateManager/Common/aptsources.py: - added NullMatcher and a "withMatcher" argument --- DistUpgrade/DistUpgradeControler.py | 2 +- UpdateManager/Common/aptsources.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'UpdateManager') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9ad95d3f..9842484d 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -143,7 +143,7 @@ class DistUpgradeControler(object): def updateSourcesList(self): logging.debug("updateSourcesList()") - self.sources = SourcesList() + self.sources = SourcesList(withMatcher=False) if not self.rewriteSourcesList(mirror_check=True): logging.error("No valid mirror found") res = self._view.askYesNoQuestion(_("No valid mirror found"), diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index fce06c2b..3d317b15 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -204,11 +204,17 @@ class SourceEntry: return line # the SourceList file as a class +class NullMatcher(object): + def match(self, s): + return True + class SourcesList: def __init__(self, withMatcher=True): self.list = [] # of Type SourceEntries if withMatcher: self.matcher = SourceEntryMatcher() + else: + self.matcher = NullMatcher() self.refresh() def refresh(self): -- cgit v1.2.3 From 19639e82319463cfb5c311155d63e06dd8ad5bde Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 10:07:30 +0200 Subject: * data/update-manager.schemas.in: - set check_dist_upgrades to True again * UpdateManager/DistUpgradeFetcher.py, UpdateManager/MetaRelease.py: - handle the situation when run as non-root * UpdateManager/UpdateManager.py: - cleanup (removed dead code) --- UpdateManager/DistUpgradeFetcher.py | 5 ++++- UpdateManager/MetaRelease.py | 10 +++++++--- UpdateManager/UpdateManager.py | 17 ----------------- data/update-manager.schemas.in | 2 +- po/ar.po | 5 ++--- po/bg.po | 6 +++--- po/bn.po | 6 +++--- po/br.po | 5 ++--- po/ca.po | 6 +++--- po/cs.po | 6 +++--- po/da.po | 6 +++--- po/de.po | 6 +++--- po/el.po | 6 +++--- po/en_AU.po | 6 +++--- po/en_CA.po | 5 ++--- po/en_GB.po | 5 ++--- po/es.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/fur.po | 5 ++--- po/gl.po | 5 ++--- po/he.po | 5 ++--- po/hi.po | 5 ++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/id.po | 6 +++--- po/it.po | 6 +++--- po/ja.po | 6 +++--- po/ka.po | 5 ++--- po/ko.po | 6 +++--- po/ku.po | 5 ++--- po/lt.po | 6 +++--- po/mk.po | 5 ++--- po/ms.po | 5 ++--- po/nb.po | 6 +++--- po/ne.po | 5 ++--- po/nl.po | 6 +++--- po/no.po | 5 ++--- po/oc.po | 5 ++--- po/pa.po | 5 ++--- po/pl.po | 6 +++--- po/pt.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ro.po | 5 ++--- po/ru.po | 6 +++--- po/rw.po | 5 ++--- po/sk.po | 6 +++--- po/sr.po | 5 ++--- po/sv.po | 6 +++--- po/th.po | 6 +++--- po/tr.po | 6 +++--- po/uk.po | 5 ++--- po/update-manager.pot | 5 ++--- po/ur.po | 5 ++--- po/urd.po | 5 ++--- po/vi.po | 5 ++--- po/xh.po | 5 ++--- po/zh_CN.po | 6 +++--- po/zh_HK.po | 5 ++--- po/zh_TW.po | 6 +++--- 60 files changed, 154 insertions(+), 190 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index aa51066a..4aacdae4 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -190,7 +190,10 @@ class DistUpgradeFetcher(object): def runDistUpgrader(self): #print "runing: %s" % script - os.execv(self.script,[]) + if os.getuid() != 0: + os.execv("/usr/bin/gksu",["gksu",self.script]) + else: + os.execv(self.script,[self.script]) def cleanup(self): # cleanup diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index 57a808ee..70993eaf 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -60,8 +60,15 @@ class MetaRelease(gobject.GObject): def __init__(self, useDevelopmentRelase=False): gobject.GObject.__init__(self) + # check what uri to use if useDevelopmentRelase: self.METARELEASE_URI = self.METARELEASE_URI_UNSTABLE + # check if we can access the METARELEASE_FILE + if not os.access(self.METARELEASE_FILE, os.F_OK|os.W_OK|os.R_OK): + path = os.path.expanduser("~/.update-manager/") + if not os.path.exists(path): + os.mkdir(path) + self.METARELEASE_FILE = os.path.join(path,"meta-release") self.metarelease_information = None self.downloading = True # we start the download thread here and we have a timeout @@ -168,6 +175,3 @@ class MetaRelease(gobject.GObject): if os.path.exists(self.METARELEASE_FILE): f=open(self.METARELEASE_FILE,"r") -# register in the gobject system, needed for older versions of pygtk, -# never ones do this automatically -gobject.type_register(MetaRelease) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 109e4d0c..d1a680fb 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -695,23 +695,6 @@ class UpdateManager(SimpleGladeApp): fetcher.run() def new_dist_available(self, meta_release, upgradable_to): - #print "new_dist_available: %s" % upgradable_to.name - # check if the user already knowns about this dist - #seen = self.gconfclient.get_string("/apps/update-manager/seen_dist") - #if name == seen: - # return - - #msg = "%s\n\n%s" % (_("There is a new release of Ubuntu available!"), _("A new release with the codename '%s' is available. Please see http://www.ubuntulinux.org/ for upgrade instructions.") % name) - #dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_INFO, - # gtk.BUTTONS_CLOSE, "") - #dialog.set_markup(msg) - #check = gtk.CheckButton(_("Never show this message again")) - #check.show() - #dialog.vbox.pack_start(check) - #dialog.run() - #if check.get_active(): - # self.gconfclient.set_string("/apps/update-manager/seen_dist",name) - #dialog.destroy() self.frame_new_release.show() self.label_new_release.set_markup(_("New distribution release '%s' is available") % upgradable_to.version) self.new_dist = upgradable_to diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index 275f8be5..ad72c893 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -52,7 +52,7 @@ /apps/update-manager/check_dist_upgrades update-manager bool - False + True Check for new distribution releases diff --git a/po/ar.po b/po/ar.po index b25550fa..e3b7a07d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -559,8 +559,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/bg.po b/po/bg.po index de6df323..ab5a9315 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -623,8 +623,8 @@ msgid "Start the upgrade?" msgstr "Започване на надграждането?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Надграждане до Ubuntu 6.06 LTS" diff --git a/po/bn.po b/po/bn.po index dcd7a2fb..0490bc35 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -575,8 +575,8 @@ msgid "Start the upgrade?" msgstr "আপগ্রেড শুরু করবো?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি" diff --git a/po/br.po b/po/br.po index 784f625b..7f2f655b 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -560,8 +560,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ca.po b/po/ca.po index 6da4ed56..d99c3c7f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -611,8 +611,8 @@ msgid "Start the upgrade?" msgstr "Voleu iniciar l'actualització?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "S'està actualitzant a Ubuntu 6.06 " "LTS" diff --git a/po/cs.po b/po/cs.po index 9387e60b..46455dbd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -598,8 +598,8 @@ msgid "Start the upgrade?" msgstr "Spustit upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Přechází se na Ubuntu 6.06 LTS" diff --git a/po/da.po b/po/da.po index 8d2981b1..945665c1 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -612,8 +612,8 @@ msgid "Start the upgrade?" msgstr "Start opgraderinegn?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Opgraderer til Ubuntu 6.06 LTS" diff --git a/po/de.po b/po/de.po index 412385d2..62d0a33a 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -643,8 +643,8 @@ msgid "Start the upgrade?" msgstr "Mit der Aktualisierung beginnen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Auf Ubuntu 6.06 LTS aktualisieren" diff --git a/po/el.po b/po/el.po index df431e8b..82637cee 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -632,8 +632,8 @@ msgid "Start the upgrade?" msgstr "Έναρξη της αναβάθμισης;" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Αναβάθμιση σε Ubuntu 6.06 LTS" diff --git a/po/en_AU.po b/po/en_AU.po index 983a7e36..b2fce2b8 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -624,8 +624,8 @@ msgid "Start the upgrade?" msgstr "Start the upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Upgrading to Ubuntu 6.06 LTS" diff --git a/po/en_CA.po b/po/en_CA.po index ea0eb274..4a369995 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -572,8 +572,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/en_GB.po b/po/en_GB.po index 42f56e94..c52c6360 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -572,8 +572,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/es.po b/po/es.po index 8be24196..c94cd689 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -641,8 +641,8 @@ msgid "Start the upgrade?" msgstr "¿Comenzar la actualización?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Actualizando a Ubuntu 6.06 LTS" diff --git a/po/fi.po b/po/fi.po index 4fb7509c..e2fdf322 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Aloita päivitys?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Päivitetään jakeluun: Ubuntu 6.06 " "LTS" diff --git a/po/fr.po b/po/fr.po index d3d1746a..58dd3821 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -639,8 +639,8 @@ msgid "Start the upgrade?" msgstr "Démarrer la mise à jour ?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Mise à jour vers Ubuntu 6.06 LTS" diff --git a/po/fur.po b/po/fur.po index 256127d4..0f023bf6 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/gl.po b/po/gl.po index 1370f0da..e01f692f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -577,8 +577,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/he.po b/po/he.po index 2b3b0c3b..11dd8e71 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -576,8 +576,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/hi.po b/po/hi.po index d0862c24..d74f18ea 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/hr.po b/po/hr.po index 85aa2a13..1ebed52d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -630,8 +630,8 @@ msgid "Start the upgrade?" msgstr "Pokrenuti nadogradnju?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Nadograđujem na Ubuntu 6.06 LTS" diff --git a/po/hu.po b/po/hu.po index a124cc27..751d60e4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Megkezdi a frissítést?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Frissítés az Ubuntu 6.06 LTS " "változatra" diff --git a/po/id.po b/po/id.po index 6f8f1983..9c376c9c 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -624,8 +624,8 @@ msgid "Start the upgrade?" msgstr "Mulai upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Mengupgrade ke Ubuntu 6.06 LTS" diff --git a/po/it.po b/po/it.po index f61c58f9..c8834742 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -637,8 +637,8 @@ msgid "Start the upgrade?" msgstr "Avviare l'aggiornamento?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Aggiornamento a Ubuntu 6.06 LTS" diff --git a/po/ja.po b/po/ja.po index 448e8696..b26d511a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -618,8 +618,8 @@ msgid "Start the upgrade?" msgstr "アップグレードを開始しますか？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Ubuntu 6.06 LTS にアップデート中" diff --git a/po/ka.po b/po/ka.po index 0e776ab9..58abf1cf 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -605,8 +605,7 @@ msgstr " გაშვება" #: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr " -სკენ" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ko.po b/po/ko.po index 227b519f..31af9cb9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -612,8 +612,8 @@ msgid "Start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "우분투 6.06 LTS로 업그레이드하는 중" diff --git a/po/ku.po b/po/ku.po index 42644134..a847dcc4 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "Dest bi bilindkirinê were kirin?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/lt.po b/po/lt.po index 0e5df421..d528796e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -619,8 +619,8 @@ msgid "Start the upgrade?" msgstr "Pradėti atnaujinimą?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Atnaujinama į Ubuntu 6.06 LTS" diff --git a/po/mk.po b/po/mk.po index 3ca8f9bb..ec6d72ed 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -580,8 +580,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ms.po b/po/ms.po index baba9a1a..bd5ccaea 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -593,8 +593,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/nb.po b/po/nb.po index 0edbc0c9..2f015f9f 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Vil du starte oppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Oppgraderer til Ubuntu 6.06 LTS" diff --git a/po/ne.po b/po/ne.po index cbef83ef..d186e5ad 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -569,8 +569,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/nl.po b/po/nl.po index 9efe0175..566c4663 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -634,8 +634,8 @@ msgid "Start the upgrade?" msgstr "Upgrade starten?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Bezig met upgraden naar Ubuntu 6.06 " "LTS" diff --git a/po/no.po b/po/no.po index 1b04ca84..0450f229 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -573,8 +573,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/oc.po b/po/oc.po index a2209808..9f6a934b 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -563,8 +563,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/pa.po b/po/pa.po index 3e5fd974..5fff5a52 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -559,8 +559,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/pl.po b/po/pl.po index b37d0d39..f3e2c10f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Rozpocząć aktualizację?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Aktualizacja do Ubuntu 6.06 LTS" diff --git a/po/pt.po b/po/pt.po index 1e9fe9db..86cd5af4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a actualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "A actualizar para Ubuntu 6.06 LTS" diff --git a/po/pt_BR.po b/po/pt_BR.po index cb3c8c2c..0cd6d801 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -631,8 +631,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a Atualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Atualizando para o Ubuntu 6.06 LTS" diff --git a/po/ro.po b/po/ro.po index e73adf0f..8b4e20f2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -580,8 +580,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ru.po b/po/ru.po index c14af2cf..aeab7e61 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Начать обновление?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Обновление до Ubuntu 6.06 LTS" diff --git a/po/rw.po b/po/rw.po index abba200e..e4646d6f 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -574,8 +574,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/sk.po b/po/sk.po index 974215ac..a85d7a7a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Spustiť aktualizáciu?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Prebieha aktualizácia na Ubuntu 6.06 " "LTS" diff --git a/po/sr.po b/po/sr.po index 7a432396..68f60b4a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -560,8 +560,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/sv.po b/po/sv.po index 03fe3e20..9c68eb2e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -627,8 +627,8 @@ msgid "Start the upgrade?" msgstr "Starta uppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Uppdaterar till Ubuntu 6.06 LTS" diff --git a/po/th.po b/po/th.po index d42d3b0f..ad26059c 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -599,8 +599,8 @@ msgid "Start the upgrade?" msgstr "เริ่มการปรับปรุงหรือไม่?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "กำลังปรับปรุงอูบันตู 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/tr.po b/po/tr.po index e8018237..3432b48b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -573,8 +573,8 @@ msgid "Start the upgrade?" msgstr "Yükseltme başlatılsın mı?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Ubuntu 6.06 LTS'ya yükseltiliyor" diff --git a/po/uk.po b/po/uk.po index 322af381..4f9d4477 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -590,8 +590,7 @@ msgid "Start the upgrade?" msgstr "Почати апгрейд системи?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/update-manager.pot b/po/update-manager.pot index 897a7804..e3c9c7b9 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ur.po b/po/ur.po index 3464b679..6b15c85d 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/urd.po b/po/urd.po index 18e68cec..ec89cf4b 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/vi.po b/po/vi.po index c03e91e0..e7235f90 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -562,8 +562,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/xh.po b/po/xh.po index e519731a..05af4f99 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/zh_CN.po b/po/zh_CN.po index d9e7edab..f2881f39 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -594,8 +594,8 @@ msgid "Start the upgrade?" msgstr "开始升级？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "正在升级到 Ubuntu 6.06 LTS" diff --git a/po/zh_HK.po b/po/zh_HK.po index b89955ac..5ef6fb94 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -565,8 +565,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d0bb9d7..b048f48e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -588,8 +588,8 @@ msgid "Start the upgrade?" msgstr "開始升級？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "升級至 Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 -- cgit v1.2.3 From eb74fddcc11cf40ef207157a36308aa29801e907 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 10:33:16 +0200 Subject: * UpdateManager/DistUpgradeFetcher.py: - don't use the trustdb anymore because it if mode 0600 and can't be read as user --- UpdateManager/DistUpgradeFetcher.py | 4 +--- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index 4aacdae4..af07cfb4 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -105,15 +105,13 @@ class DistUpgradeFetcher(object): return True def gpgauthenticate(self, file, signature, - keyring='/etc/apt/trusted.gpg', - trustdb='/etc/apt/trustdb.gpg'): + keyring='/etc/apt/trusted.gpg'): """ authenticated a file against a given signature, if no keyring is given use the apt default keyring """ gpg = GnuPGInterface.GnuPG() gpg.options.extra_args = ['--no-options', '--no-default-keyring', - '--trustdb-name',trustdb, '--keyring', keyring] proc = gpg.run(['--verify', signature, file], create_fhs=['status','logger','stderr']) diff --git a/debian/changelog b/debian/changelog index 981c5564..c5347d2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.1) edgy; urgency=low + + * make UpdateManager check for new distribution releases by + default again + * fix dist-upgrade fetching when run as root. + + -- + update-manager (0.44) edgy; urgency=low * new SoftwareProperties GUI (thanks to Sebastian Heinlein) -- cgit v1.2.3 From 6de4c375de972ad34a15dbe56305d62e8faa23a0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 12:41:24 +0200 Subject: * UpdateManager/UpdateManager.py: - implemented support to show what origin the update comes from --- UpdateManager/UpdateManager.py | 104 ++++++++++++++++++++++++++++------------- debian/changelog | 1 + 2 files changed, 73 insertions(+), 32 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d1a680fb..ce46d737 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -69,8 +69,7 @@ from MetaRelease import Dist, MetaRelease # - kill "all_changes" and move the changes into the "Update" class # list constants -(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_SHORTDESC, - LIST_VERSION, LIST_LONG_DESCR, LIST_PKG) = range(7) +(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_PKG) = range(4) # actions for "invoke_manager" (INSTALL, UPDATE) = range(2) @@ -201,23 +200,43 @@ class MyCache(apt.Cache): lock.release() class UpdateList: + ORIGIN_MAPPING = { ("edgy-security","Ubuntu"): _("Ubuntu security updates"), + ("edgy-updates","Ubuntu"): _("Ubuntu important updates updates"), + ("edgy","Ubuntu"): _("Ubuntu updates") + } + def __init__(self, parent_window): - self.pkgs = [] + # a map of packages under their origin + self.pkgs = {} self.num_updates = 0 self.parent_window = parent_window def update(self, cache): held_back = [] broken = [] + + # do the upgrade cache.saveDistUpgrade() + + # sort by origin for pkg in cache: if pkg.markedUpgrade or pkg.markedInstall: - self.pkgs.append(pkg) + originstr = _("Unknown") + for aorigin in pkg.candidateOrigin: + archive = aorigin.archive + origin = aorigin.origin + if self.ORIGIN_MAPPING.has_key((archive,origin)) and aorigin.trusted: + originstr = self.ORIGIN_MAPPING[(archive,origin)] + if not self.pkgs.has_key(originstr): + self.pkgs[originstr] = [] + self.pkgs[originstr].append(pkg) self.num_updates = self.num_updates + 1 elif pkg.isUpgradable: - #print "MarkedKeep: %s " % pkg.name held_back.append(pkg.name) - self.pkgs.sort(lambda x,y: cmp(x.name,y.name)) + for l in self.pkgs.keys(): + self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) + + # check if we have held-back something if cache._depcache.KeepCount > 0: #print "WARNING, keeping packages" msg = ("%s\n\n%s" % \ @@ -295,32 +314,34 @@ class UpdateManager(SimpleGladeApp): self.button_close.connect("clicked", lambda w: self.exit()) # the treeview (move into it's own code!) - self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, str, str, str, - gobject.TYPE_PYOBJECT) + self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, gobject.TYPE_PYOBJECT) self.treeview_update.set_model(self.store) self.treeview_update.set_headers_clickable(True); tr = gtk.CellRendererText() tr.set_property("xpad", 10) tr.set_property("ypad", 10) - cr = gtk.CellRendererToggle() + self.cr = cr = gtk.CellRendererToggle() cr.set_property("activatable", True) cr.set_property("xpad", 10) cr.connect("toggled", self.toggled) - self.cb = gtk.TreeViewColumn("Install", cr, active=LIST_INSTALL) - c0 = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) - c0.set_resizable(True) + + column_install = gtk.TreeViewColumn("Install", cr) + column_install.set_cell_data_func (cr, self.install_column_view_func) + column = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) + column.set_cell_data_func (tr, self.package_column_view_func) + column.set_resizable(True) major,minor,patch = gtk.pygtk_version if (major >= 2) and (minor >= 5): - self.cb.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - self.cb.set_fixed_width(30) - c0.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - c0.set_fixed_width(100) + column_install.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column_install.set_fixed_width(30) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column.set_fixed_width(100) #self.treeview_update.set_fixed_height_mode(True) - self.treeview_update.append_column(self.cb) - self.cb.set_visible(True) - self.treeview_update.append_column(c0) + self.treeview_update.append_column(column_install) + column_install.set_visible(True) + self.treeview_update.append_column(column) self.treeview_update.set_search_column(LIST_NAME) @@ -356,6 +377,23 @@ class UpdateManager(SimpleGladeApp): self.restore_state() self.window_main.show() + def header_column_func(self, cell_layot, renderer, model, iter): + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + renderer.set_property("cell-background","green") + else: + renderer.set_property("cell-background", None) + + def install_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + pkg = model.get_value(iter, LIST_PKG) + if self.cr == renderer: + renderer.set_property("visible", pkg != None) + + + def package_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + def setupDbus(self): """ this sets up a dbus listener if none is installed alread """ # check if there is another g-a-i already and if not setup one @@ -429,7 +467,10 @@ class UpdateManager(SimpleGladeApp): iter = model.get_iter(path) # set descr - long_desc = model.get_value(iter, LIST_LONG_DESCR) + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + return + long_desc = pkg.description if long_desc == None: return # Skip the first line - it's a duplicate of the summary @@ -526,7 +567,7 @@ class UpdateManager(SimpleGladeApp): self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() - self.treeview_update.set_cursor(0) + self.treeview_update.set_cursor(1) self.label_header.set_markup(text_header) self.label_downsize.set_markup(text_download) @@ -657,17 +698,16 @@ class UpdateManager(SimpleGladeApp): self.list.update(self.cache) if self.list.num_updates > 0: i=0 - for pkg in self.list.pkgs: - - name = xml.sax.saxutils.escape(pkg.name) - summary = xml.sax.saxutils.escape(pkg.summary) - contents = "%s\n%s\n\n" % (name, summary) - contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "" - - iter = self.store.append([True, contents, pkg.name, pkg.summary, - pkg.candidateVersion, pkg.description, pkg]) - self.add_update(pkg) - i = i + 1 + for origin in self.list.pkgs.keys(): + self.store.append([False, '%s' % origin, origin, None]) + for pkg in self.list.pkgs[origin]: + name = xml.sax.saxutils.escape(pkg.name) + summary = xml.sax.saxutils.escape(pkg.summary) + contents = "%s\n%s\n\n" % (name, summary) + contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "" + iter = self.store.append([True, contents, pkg.name, pkg]) + self.add_update(pkg) + i = i + 1 self.update_count() # use the normal cursor diff --git a/debian/changelog b/debian/changelog index c5347d2e..cfad987e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ update-manager (0.44.1) edgy; urgency=low * make UpdateManager check for new distribution releases by default again * fix dist-upgrade fetching when run as root. + * sort the package list by the origin (UpdateManagerEdgy spec) -- -- cgit v1.2.3 From 34eb9fd012b1edfb460642ce7678c28fb0840ed1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 12:58:46 +0200 Subject: * UpdateManager/UpdateManager.py: - use "yellow" instead of "green" - bugfixes in the new column header code --- UpdateManager/UpdateManager.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index ce46d737..2e2433a8 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -201,7 +201,8 @@ class MyCache(apt.Cache): class UpdateList: ORIGIN_MAPPING = { ("edgy-security","Ubuntu"): _("Ubuntu security updates"), - ("edgy-updates","Ubuntu"): _("Ubuntu important updates updates"), + ("edgy-updates","Ubuntu"): _("Ubuntu important updates"), + ("edgy-backports","Ubuntu"): _("Ubuntu backports"), ("edgy","Ubuntu"): _("Ubuntu updates") } @@ -321,7 +322,7 @@ class UpdateManager(SimpleGladeApp): tr = gtk.CellRendererText() tr.set_property("xpad", 10) tr.set_property("ypad", 10) - self.cr = cr = gtk.CellRendererToggle() + cr = gtk.CellRendererToggle() cr.set_property("activatable", True) cr.set_property("xpad", 10) cr.connect("toggled", self.toggled) @@ -380,16 +381,17 @@ class UpdateManager(SimpleGladeApp): def header_column_func(self, cell_layot, renderer, model, iter): pkg = model.get_value(iter, LIST_PKG) if pkg == None: - renderer.set_property("cell-background","green") + renderer.set_property("cell-background","yellow") else: renderer.set_property("cell-background", None) def install_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) pkg = model.get_value(iter, LIST_PKG) - if self.cr == renderer: - renderer.set_property("visible", pkg != None) - + to_install = model.get_value(iter, LIST_INSTALL) + renderer.set_property("active", to_install) + # hide it if we are only a header line + renderer.set_property("visible", pkg != None) def package_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) @@ -435,24 +437,17 @@ class UpdateManager(SimpleGladeApp): return for line in lines: - end_iter = changes_buffer.get_end_iter() - - version_match = re.match(r'^%s \((.*)\)(.*)$' % re.escape(srcpkg), line) + version_match = re.match(r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line) #bullet_match = re.match("^.*[\*-]", line) author_match = re.match("^.*--.*<.*@.*>.*$", line) if version_match: version = version_match.group(1) + upload_archive = version_match.group(2).strip() version_text = _("Version %s: \n") % version changes_buffer.insert_with_tags_by_name(end_iter, version_text, "versiontag") - # mvo: disabled for now as it does not catch multi line entries - # (see ubuntu #7034 for rational) - #elif bullet_match and not author_match: - # bullet_text = " " + line + "\n" - # changes_buffer.insert(end_iter, bullet_text) elif (author_match): pass - #chanages_buffer.insert(end_iter, "\n") else: changes_buffer.insert(end_iter, line+"\n") -- cgit v1.2.3