Merge lp:~nikola825/ubuntu/oneiric/python-apt/fix-for-500940 into lp:ubuntu/oneiric/python-apt

Proposed by Никола Павловић on 2011-11-13
Status: Work in progress
Proposed branch: lp:~nikola825/ubuntu/oneiric/python-apt/fix-for-500940
Merge into: lp:ubuntu/oneiric/python-apt
Diff against target: 525 lines (+207/-36)
7 files modified
apt/package.py (+2/-2)
aptsources/sourceslist.py (+1/-1)
data/templates/Ubuntu.info.in (+145/-24)
data/templates/Ubuntu.mirrors (+11/-7)
debian/changelog (+46/-0)
tests/test_apt_cache.py (+1/-1)
tests/test_progress.py (+1/-1)
To merge this branch: bzr merge lp:~nikola825/ubuntu/oneiric/python-apt/fix-for-500940
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-11-13 Pending
Review via email: mp+82079@code.launchpad.net

Description of the change

A fix for the bug 500940, fixed a typo: changed "Open Source software" to "free software" in /data/templates/Ubuntu.info.in

To post a comment you must log in.
152. By Nikola Pavlovic <email address hidden> on 2011-11-13

Dlog

Stéphane Graber (stgraber) wrote :

It looks like your branch is doing quite a bit more than what you describe.
Could it be that you based your branch on what's in Precise rather than what's in Oneiric?

I'd recommend you first submit a branch that applies to current trunk (precise) in lp:ubuntu/python-apt

This kind of change usually doesn't meet criteria for an SRU, so it should definitely be targeted at Precise.

I'm marking this merge proposal as work in progress, please switch it back to needs review once it's been rebased on lp:ubuntu/python-apt so someone can get your fix uploaded.

Thanks for your work!

I'm sorry for the mess it cause. I'm new to fixing bugs, and this branch was my first bug fix, but Michael Vogt made a better fix in the branch lp:~mvo/python-apt/mvo, so you could just ignore this branch.

Unmerged revisions

152. By Nikola Pavlovic <email address hidden> on 2011-11-13

Dlog

151. By Nikola Pavlovic <email address hidden> on 2011-11-13

fixed a typo, changed "Open Source software" to "free software" (LP: #500940

150. By Michael Vogt on 2011-10-19

* aptsources/sourceslist.py:
  - import distinfo from the same dir (LP: #871007)
* data/templates/Ubuntu.info.in:
  - add precise

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt/package.py'
2--- apt/package.py 2011-08-09 16:04:04 +0000
3+++ apt/package.py 2011-11-13 19:00:32 +0000
4@@ -973,8 +973,8 @@
5 another package, and if no packages depend on it anymore, the package
6 is no longer required.
7 """
8- return self.is_installed and \
9- self._pcache._depcache.is_garbage(self._pkg)
10+ return ((self.is_installed or self.marked_install) and
11+ self._pcache._depcache.is_garbage(self._pkg))
12
13 @property
14 def is_auto_installed(self):
15
16=== modified file 'aptsources/sourceslist.py'
17--- aptsources/sourceslist.py 2011-08-08 22:48:43 +0000
18+++ aptsources/sourceslist.py 2011-11-13 19:00:32 +0000
19@@ -33,7 +33,7 @@
20 import time
21
22 import apt_pkg
23-from aptsources.distinfo import DistInfo
24+from distinfo import DistInfo
25 from apt.deprecation import function_deprecated_by
26
27
28
29=== modified file 'data/templates/Ubuntu.info.in'
30--- data/templates/Ubuntu.info.in 2011-09-28 16:27:20 +0000
31+++ data/templates/Ubuntu.info.in 2011-11-13 19:00:32 +0000
32@@ -1,5 +1,123 @@
33 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
34
35+Suite: precise
36+RepositoryType: deb
37+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
38+MatchURI: ports.ubuntu.com/ubuntu-ports
39+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
40+MatchURI-amd64: archive.ubuntu.com/ubuntu
41+BaseURI-i386: http://archive.ubuntu.com/ubuntu
42+MatchURI-i386: archive.ubuntu.com/ubuntu
43+MirrorsFile-amd64: Ubuntu.mirrors
44+MirrorsFile-i386: Ubuntu.mirrors
45+_Description: Ubuntu 12.04 'Precise Pangolin'
46+Component: main
47+_CompDescription: Officially supported
48+_CompDescriptionLong: Canonical-supported free software
49+Component: universe
50+_CompDescription: Community-maintained
51+_CompDescriptionLong: Community-maintained free software
52+Component: restricted
53+_CompDescription: Non-free drivers
54+_CompDescriptionLong: Proprietary drivers for devices
55+Component: multiverse
56+ParentComponent: universe
57+_CompDescription: Restricted software
58+_CompDescriptionLong: Software restricted by copyright or legal issues
59+
60+Suite: precise
61+ParentSuite: precise
62+RepositoryType: deb-src
63+BaseURI: http://archive.ubuntu.com/ubuntu/
64+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
65+_Description: Ubuntu 12.04 'Precise Pangolin'
66+
67+Suite: precise
68+RepositoryType: deb
69+MatchName: .*
70+BaseURI: cdrom:\[Ubuntu.*12.04
71+MatchURI: cdrom:\[Ubuntu.*12.04
72+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
73+Available: False
74+Component: main
75+_CompDescription: Officially supported
76+Component: restricted
77+_CompDescription: Restricted copyright
78+
79+Suite: precise
80+Official: false
81+RepositoryType: deb
82+BaseURI: http://archive.canonical.com
83+MatchURI: archive.canonical.com
84+_Description: Canonical Partners
85+Component: partner
86+_CompDescription: Software packaged by Canonical for their partners
87+_CompDescriptionLong: This software is not part of Ubuntu.
88+
89+Suite: precise
90+Official: false
91+RepositoryType: deb
92+BaseURI: http://extras.ubuntu.com
93+MatchURI: extras.ubuntu.com
94+_Description: Independent
95+Component: main
96+_CompDescription: Provided by third-party software developers
97+_CompDescriptionLong: Software offered by third party developers.
98+
99+Suite: precise-security
100+ParentSuite: precise
101+RepositoryType: deb
102+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
103+MatchURI: ports.ubuntu.com/ubuntu-ports
104+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
105+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
106+BaseURI-i386: http://security.ubuntu.com/ubuntu/
107+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
108+_Description: Important security updates
109+
110+Suite: precise-security
111+ParentSuite: precise
112+RepositoryType: deb-src
113+BaseURI: http://archive.ubuntu.com/ubuntu/
114+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
115+_Description: Important security updates
116+
117+Suite: precise-updates
118+ParentSuite: precise
119+RepositoryType: deb
120+_Description: Recommended updates
121+
122+Suite: precise-updates
123+ParentSuite: precise
124+RepositoryType: deb-src
125+BaseURI: http://archive.ubuntu.com/ubuntu/
126+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
127+_Description: Recommended updates
128+
129+Suite: precise-proposed
130+ParentSuite: precise
131+RepositoryType: deb
132+_Description: Pre-released updates
133+
134+Suite: precise-proposed
135+ParentSuite: precise
136+RepositoryType: deb-src
137+BaseURI: http://archive.ubuntu.com/ubuntu/
138+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
139+_Description: Pre-released updates
140+
141+Suite: precise-backports
142+ParentSuite: precise
143+RepositoryType: deb
144+_Description: Unsupported updates
145+
146+Suite: precise-backports
147+ParentSuite: precise
148+RepositoryType: deb-src
149+BaseURI: http://archive.ubuntu.com/ubuntu/
150+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
151+_Description: Unsupported updates
152+
153 Suite: oneiric
154 RepositoryType: deb
155 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
156@@ -13,10 +131,10 @@
157 _Description: Ubuntu 11.10 'Oneiric Ocelot'
158 Component: main
159 _CompDescription: Officially supported
160-_CompDescriptionLong: Canonical-supported Open Source software
161+_CompDescriptionLong: Canonical-supported free software
162 Component: universe
163 _CompDescription: Community-maintained
164-_CompDescriptionLong: Community-maintained Open Source software
165+_CompDescriptionLong: Community-maintained free software
166 Component: restricted
167 _CompDescription: Non-free drivers
168 _CompDescriptionLong: Proprietary drivers for devices
169@@ -132,10 +250,10 @@
170 _Description: Ubuntu 11.04 'Natty Narwhal'
171 Component: main
172 _CompDescription: Officially supported
173-_CompDescriptionLong: Canonical-supported Open Source software
174+_CompDescriptionLong: Canonical-supported free software
175 Component: universe
176 _CompDescription: Community-maintained
177-_CompDescriptionLong: Community-maintained Open Source software
178+_CompDescriptionLong: Community-maintained free software
179 Component: restricted
180 _CompDescription: Non-free drivers
181 _CompDescriptionLong: Proprietary drivers for devices
182@@ -250,10 +368,10 @@
183 _Description: Ubuntu 10.10 'Maverick Meerkat'
184 Component: main
185 _CompDescription: Officially supported
186-_CompDescriptionLong: Canonical-supported Open Source software
187+_CompDescriptionLong: Canonical-supported free software
188 Component: universe
189 _CompDescription: Community-maintained
190-_CompDescriptionLong: Community-maintained Open Source software
191+_CompDescriptionLong: Community-maintained free software
192 Component: restricted
193 _CompDescription: Non-free drivers
194 _CompDescriptionLong: Proprietary drivers for devices
195@@ -333,10 +451,10 @@
196 _Description: Ubuntu 10.04 'Lucid Lynx'
197 Component: main
198 _CompDescription: Officially supported
199-_CompDescriptionLong: Canonical-supported Open Source software
200+_CompDescriptionLong: Canonical-supported free software
201 Component: universe
202 _CompDescription: Community-maintained
203-_CompDescriptionLong: Community-maintained Open Source software
204+_CompDescriptionLong: Community-maintained free software
205 Component: restricted
206 _CompDescription: Non-free drivers
207 _CompDescriptionLong: Proprietary drivers for devices
208@@ -396,14 +514,15 @@
209 _Description: Ubuntu 9.10 'Karmic Koala'
210 Component: main
211 _CompDescription: Officially supported
212-_CompDescriptionLong: Canonical-supported Open Source software
213+_CompDescriptionLong: Canonical-supported free software
214 Component: universe
215 _CompDescription: Community-maintained
216-_CompDescriptionLong: Community-maintained Open Source software
217+_CompDescriptionLong: Community-maintained free software
218 Component: restricted
219 _CompDescription: Non-free drivers
220 _CompDescriptionLong: Proprietary drivers for devices
221 Component: multiverse
222+ParentComponent: universe
223 _CompDescription: Restricted software
224 _CompDescriptionLong: Software restricted by copyright or legal issues
225
226@@ -458,10 +577,10 @@
227 _Description: Ubuntu 9.04 'Jaunty Jackalope'
228 Component: main
229 _CompDescription: Officially supported
230-_CompDescriptionLong: Canonical-supported Open Source software
231+_CompDescriptionLong: Canonical-supported free software
232 Component: universe
233 _CompDescription: Community-maintained
234-_CompDescriptionLong: Community-maintained Open Source software
235+_CompDescriptionLong: Community-maintained free software
236 Component: restricted
237 _CompDescription: Non-free drivers
238 _CompDescriptionLong: Proprietary drivers for devices
239@@ -520,14 +639,15 @@
240 _Description: Ubuntu 8.10 'Intrepid Ibex'
241 Component: main
242 _CompDescription: Officially supported
243-_CompDescriptionLong: Canonical-supported Open Source software
244+_CompDescriptionLong: Canonical-supported free software
245 Component: universe
246 _CompDescription: Community-maintained
247-_CompDescriptionLong: Community-maintained Open Source software
248+_CompDescriptionLong: Community-maintained free software
249 Component: restricted
250 _CompDescription: Non-free drivers
251 _CompDescriptionLong: Proprietary drivers for devices
252 Component: multiverse
253+ParentComponent: universe
254 _CompDescription: Restricted software
255 _CompDescriptionLong: Software restricted by copyright or legal issues
256
257@@ -583,14 +703,15 @@
258 _Description: Ubuntu 8.04 'Hardy Heron'
259 Component: main
260 _CompDescription: Officially supported
261-_CompDescriptionLong: Canonical-supported Open Source software
262+_CompDescriptionLong: Canonical-supported free software
263 Component: universe
264 _CompDescription: Community-maintained
265-_CompDescriptionLong: Community-maintained Open Source software
266+_CompDescriptionLong: Community-maintained free software
267 Component: restricted
268 _CompDescription: Non-free drivers
269 _CompDescriptionLong: Proprietary drivers for devices
270 Component: multiverse
271+ParentComponent: universe
272 _CompDescription: Restricted software
273 _CompDescriptionLong: Software restricted by copyright or legal issues
274
275@@ -647,10 +768,10 @@
276 _Description: Ubuntu 7.10 'Gutsy Gibbon'
277 Component: main
278 _CompDescription: Officially supported
279-_CompDescriptionLong: Canonical-supported Open Source software
280+_CompDescriptionLong: Canonical-supported free software
281 Component: universe
282 _CompDescription: Community-maintained
283-_CompDescriptionLong: Community-maintained Open Source software
284+_CompDescriptionLong: Community-maintained free software
285 Component: restricted
286 _CompDescription: Non-free drivers
287 _CompDescriptionLong: Proprietary drivers for devices
288@@ -711,10 +832,10 @@
289 _Description: Ubuntu 7.04 'Feisty Fawn'
290 Component: main
291 _CompDescription: Officially supported
292-_CompDescriptionLong: Canonical-supported Open Source software
293+_CompDescriptionLong: Canonical-supported free software
294 Component: universe
295 _CompDescription: Community-maintained
296-_CompDescriptionLong: Community-maintained Open Source software
297+_CompDescriptionLong: Community-maintained free software
298 Component: restricted
299 _CompDescription: Non-free drivers
300 _CompDescriptionLong: Proprietary drivers for devices
301@@ -772,10 +893,10 @@
302 _Description: Ubuntu 6.10 'Edgy Eft'
303 Component: main
304 _CompDescription: Officially supported
305-_CompDescriptionLong: Canonical-supported Open Source software
306+_CompDescriptionLong: Canonical-supported free software
307 Component: universe
308 _CompDescription: Community-maintained
309-_CompDescriptionLong: Community-maintained Open Source software
310+_CompDescriptionLong: Community-maintained free software
311 Component: restricted
312 _CompDescription: Non-free drivers
313 _CompDescriptionLong: Proprietary drivers for devices
314@@ -833,10 +954,10 @@
315 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
316 Component: main
317 _CompDescription: Officially supported
318-_CompDescriptionLong: Canonical-supported Open Source software
319+_CompDescriptionLong: Canonical-supported free software
320 Component: universe
321 _CompDescription: Community-maintained (universe)
322-_CompDescriptionLong: Community-maintained Open Source software
323+_CompDescriptionLong: Community-maintained free software
324 Component: restricted
325 _CompDescription: Non-free drivers
326 _CompDescriptionLong: Proprietary drivers for devices
327
328=== modified file 'data/templates/Ubuntu.mirrors'
329--- data/templates/Ubuntu.mirrors 2011-10-04 16:35:52 +0000
330+++ data/templates/Ubuntu.mirrors 2011-11-13 19:00:32 +0000
331@@ -125,6 +125,7 @@
332 #LOC:EE
333 http://ftp.estpak.ee/ubuntu/
334 #LOC:ES
335+http://dafi.inf.um.es/ubuntu/
336 http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
337 http://ftp.dat.etsit.upm.es/ubuntu/
338 http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/
339@@ -156,6 +157,8 @@
340 http://ubuntu.univ-reims.fr/ubuntu/
341 http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/
342 http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/
343+#LOC:GA
344+http://miroirs.refer.ga/ubuntu/
345 #LOC:GB
346 http://archive.ubuntu.com/ubuntu/
347 http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
348@@ -208,6 +211,7 @@
349 http://mirror.isoc.org.il/pub/ubuntu/
350 #LOC:IN
351 ftp://ftp.iitb.ac.in/distributions/ubuntu/archives/
352+http://ftp.iitm.ac.in/ubuntu/
353 http://mirror.cse.iitk.ac.in/ubuntu/
354 #LOC:IS
355 http://speglar.simnet.is/ubuntu/
356@@ -237,7 +241,6 @@
357 ftp://mirror.space.kz/ubuntu/
358 http://mirror.neolabs.kz/ubuntu/
359 #LOC:LK
360-http://archive.ubuntu.schoolnet.lk/ubuntu/
361 http://mirror.learn.ac.lk/ubuntu/
362 #LOC:LT
363 http://ftp.litnet.lt/ubuntu/
364@@ -270,6 +273,7 @@
365 #LOC:NL
366 ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
367 http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/
368+http://ftp.telfort.nl/pub/mirror/ubuntu/
369 http://ftp.tudelft.nl/archive.ubuntu.com/
370 http://mirror.nl.leaseweb.net/ubuntu/
371 http://nl.archive.ubuntu.com/ubuntu/
372@@ -277,6 +281,7 @@
373 http://osmirror.rug.nl/ubuntu/
374 http://ubuntu.mirror.atratoip.net/ubuntu/
375 http://ubuntu.mirror.cambrium.nl/ubuntu/
376+http://ubuntu.tiscali.nl/
377 http://ubuntuarchive.eweka.nl/ubuntu/
378 #LOC:NO
379 http://archive.mirror.blix.eu/ubuntu/
380@@ -312,11 +317,9 @@
381 http://ubuntu.dcc.fc.up.pt/
382 #LOC:RO
383 http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/
384-http://ftp.info.uvt.ro/ubuntu/
385 http://ftp.roedu.net/mirrors/ubuntulinux.org/ubuntu/
386 http://mirror.arlug.ro/pub/ubuntu/ubuntu/
387 http://mirrors.adnettelecom.ro/ubuntu/
388-http://mirrors.penguin-host.com/ubuntu/
389 #LOC:RS
390 http://rpm.scl.rs/linux/ubuntu/archive/
391 http://ubuntu.etf.bg.ac.rs/ubuntu/
392@@ -333,10 +336,10 @@
393 http://ubuntu.mirrors.isu.net.sa/ubuntu/
394 #LOC:SE
395 http://ftp.acc.umu.se/ubuntu/
396+http://ftp.availo.se/ubuntu/
397 http://ftp.df.lth.se/ubuntu/
398 http://ftp.ds.karen.hj.se/ubuntu/
399 http://ftp.lysator.liu.se/ubuntu/
400-http://ftp.port80.se/ubuntu/
401 http://ftp.portlane.com/ubuntu/
402 http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/
403 http://ubuntu.cybercomhosting.com/ubuntu/
404@@ -376,7 +379,6 @@
405 http://shadow.ind.ntou.edu.tw/ubuntu/
406 http://tw.archive.ubuntu.com/ubuntu/
407 http://ubuntu.cs.nctu.edu.tw/ubuntu/
408-http://ubuntu.stu.edu.tw/ubuntu/
409 #LOC:UA
410 http://mirror.mirohost.net/ubuntu/
411 http://mirrors.uaip.org/ubuntu/
412@@ -407,7 +409,7 @@
413 http://mirror.pnl.gov/ubuntu/
414 http://mirror.symnds.com/ubuntu/
415 http://mirror.team-cymru.org/ubuntu/
416-http://mirror.umoss.org/ubuntu/
417+http://mirror.umd.edu/ubuntu/
418 http://mirror.uoregon.edu/ubuntu/
419 http://mirror.us.leaseweb.net/ubuntu/
420 http://mirror.vcu.edu/pub/gnu+linux/ubuntu/
421@@ -418,13 +420,16 @@
422 http://mirrors.cs.wmich.edu/ubuntu/
423 http://mirrors.easynews.com/linux/ubuntu/
424 http://mirrors.ecvps.com/ubuntu/
425+http://mirrors.gigenet.com/ubuntuarchive/
426 http://mirrors.mit.edu/ubuntu/
427 http://mirrors.pavlovmedia.net/ubuntu/
428 http://mirrors.rit.edu/ubuntu/
429+http://mirrors.us.kernel.org/ubuntu/
430 http://mirrors.xmission.com/ubuntu/
431 http://samaritan.ucmerced.edu/ubuntu/
432 http://san.csc.calpoly.edu/ubuntu/ubuntu/
433 http://ubuntu.cs.utah.edu/ubuntu/
434+http://ubuntu.eecs.wsu.edu/
435 http://ubuntu.mirror.frontiernet.net/ubuntu/
436 http://ubuntu.mirrors.pair.com/archive/
437 http://ubuntu.mirrors.tds.net/pub/ubuntu/
438@@ -435,7 +440,6 @@
439 http://ubuntu.washdc-linux.com/ubuntu/
440 http://ubuntu.wikimedia.org/ubuntu/
441 http://www.club.cc.cmu.edu/pub/ubuntu/
442-http://www.gtlib.gatech.edu/pub/ubuntu/
443 http://www.lug.bu.edu/mirror/ubuntu/
444 #LOC:UZ
445 http://ubuntu.snet.uz/ubuntu/
446
447=== modified file 'debian/changelog'
448--- debian/changelog 2011-10-04 16:35:52 +0000
449+++ debian/changelog 2011-11-13 19:00:32 +0000
450@@ -1,3 +1,49 @@
451+python-apt (0.8.1ubuntu2) oneiric; urgency=low
452+
453+ * fixed a typo, changed "Open Source software" to "free software" (LP: #500940
454+
455+ -- Nikola Pavlović <nikola825@gmail.com> Sun, 13 Nov 2011 16:26:11 +0100
456+
457+python-apt (0.8.1ubuntu1) precise; urgency=low
458+
459+ * aptsources/sourceslist.py:
460+ - import distinfo from the same dir (LP: #871007)
461+ * data/templates/Ubuntu.info.in:
462+ - add precise
463+
464+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 17:46:18 +0200
465+
466+python-apt (0.8.1) unstable; urgency=low
467+
468+ [ Julian Andres Klode ]
469+ * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)
470+
471+ [ Michael Vogt ]
472+ * python/arfile.cc:
473+ - use APT::Configuration::getCompressionTypes() instead of duplicating
474+ the supported methods here
475+ * tests/test_debfile.py:
476+ - add test for raise on unknown data.tar.xxx
477+ * tests/test_aptsources_ports.py, tests/test_aptsources.py:
478+ - use tmpdir during the tests to fix test failure with apt from
479+ experimental
480+ * tests/test_apt_cache.py:
481+ - fix test by providing proper fixture data
482+ - fix test if sources.list is not readable (as is the case on some
483+ PPA buildds)
484+ * apt/package.py:
485+ - fix py3 compatiblity with print
486+ * tests/test_all.py:
487+ - skip all tests if sources.list is not readable (as is the case on
488+ some builds)
489+ - packages in marked_install state can also be auto-removable
490+ * add concept of "ParentComponent" for e.g. ubuntu/multiverse
491+ that needs universe enabled as well (plus add test)
492+ * apt/progress/gtk2.py:
493+ - update to the latest vte API for child-exited (LP: #865388)
494+
495+ -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2011 16:39:13 +0200
496+
497 python-apt (0.8.0ubuntu9) oneiric; urgency=low
498
499 * apt/progress/gtk2.py:
500
501=== modified file 'tests/test_apt_cache.py'
502--- tests/test_apt_cache.py 2011-08-08 14:24:29 +0000
503+++ tests/test_apt_cache.py 2011-11-13 19:00:32 +0000
504@@ -133,7 +133,7 @@
505 old_source_list = apt_pkg.config.find("dir::etc::sourcelist")
506 old_source_parts = apt_pkg.config.find("dir::etc::sourceparts")
507 apt_pkg.config.set("dir::etc::sourcelist", base_sources)
508- apt_pkg.config.set("dir::etc::sourceparts", "xxx")
509+ apt_pkg.config.set("dir::etc::sourceparts", "/tmp")
510 # main sources.list
511 sources_list = base_sources
512 with open(sources_list, "w") as f:
513
514=== modified file 'tests/test_progress.py'
515--- tests/test_progress.py 2011-04-12 15:25:38 +0000
516+++ tests/test_progress.py 2011-11-13 19:00:32 +0000
517@@ -27,7 +27,7 @@
518 apt_pkg.init()
519 apt_pkg.config.set("APT::Architecture", "amd64")
520 apt_pkg.config.set("Dir::Etc", basedir)
521- apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
522+ apt_pkg.config.set("Dir::Etc::sourceparts", "/tmp")
523 # setup lists dir
524 if not os.path.exists("./tmp/partial"):
525 os.makedirs("./tmp/partial")

Subscribers

People subscribed via source and target branches