diff options
| author | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-04-20 22:19:26 +0200 |
|---|---|---|
| committer | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-04-20 22:19:26 +0200 |
| commit | e24f0af7b8efd56248a16beccda41399e4a361b3 (patch) | |
| tree | e2025b906fd88b9e1c5f284e82962f5258f61da1 /UpdateManager | |
| parent | f8724e0b2329dbd497419123e38bb36d7bbeed71 (diff) | |
| parent | 3cb73fd8b75b2ef4de7a9bd25fb5d41950078550 (diff) | |
| download | python-apt-e24f0af7b8efd56248a16beccda41399e4a361b3.tar.gz | |
merged from mvo
Diffstat (limited to 'UpdateManager')
| -rw-r--r-- | UpdateManager/UpdateManager.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 83ca5d57..6ac83197 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -102,10 +102,11 @@ class MyCache(apt.Cache): # assume "main" section src_section = "main" - # check if we have something else - l = string.split(pkg.section,"/") + # make sure to get the section of the candidate + section = pkg._depcache.GetCandidateVer(pkg._pkg).Section + l = section.split("/") if len(l) > 1: - sec_section = l[0] + src_section = l[0] # lib is handled special prefix = srcpkg[0] @@ -281,6 +282,8 @@ class UpdateManager(SimpleGladeApp): proxy_host = cnf.Find("Synaptic::httpProxy") proxy_port = str(cnf.FindI("Synaptic::httpProxyPort")) if proxy_host and proxy_port: + # FIXME: set the proxy for libapt here as well (e.g. for the + # DistUpgradeFetcher proxy_support = urllib2.ProxyHandler({"http":"http://%s:%s" % (proxy_host, proxy_port)}) opener = urllib2.build_opener(proxy_support) urllib2.install_opener(opener) @@ -318,7 +321,7 @@ class UpdateManager(SimpleGladeApp): end_iter = changes_buffer.get_end_iter() - version_match = re.match("^%s \((.*)\)(.*)$" % (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: |