Merge lp:~ilidrissi.amine/update-manager/group-of-patches into lp:update-manager

Proposed by Mohamed Amine Ilidrissi
Status: Merged
Merged at revision: 1890
Proposed branch: lp:~ilidrissi.amine/update-manager/group-of-patches
Merge into: lp:update-manager
Diff against target: 41 lines (+7/-2)
3 files modified
UpdateManager/Core/MyCache.py (+2/-0)
UpdateManager/UpdateManager.py (+3/-2)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~ilidrissi.amine/update-manager/group-of-patches
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+32252@code.launchpad.net

Description of the change

This branch includes 2 patches from Nicolò Chieffo. Please see the related bugs for more info.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for the branch. Unfortunately the change to look for changelogs inside launchpad is not suitable. The reason is that launchpad.net generates the pages dynamically out of a database. Hitting them from potentially hundrets of thousands of users is dangerous. But the good news is that the launchpad soyuz team is working on providing the changelogs in the PPA pool/ directory. This way its a static file served by apache and we can use that performance risks for launchpad.

The other fix looks very good and I'm happy to take it.

1885. By Mohamed Amine IL Idrissi <devildante@devildante-laptop>

Merge patch from Nicolò Chieffo, many thanks.

1886. By Mohamed Amine IL Idrissi <devildante@devildante-laptop>

merge with trunk and modified debian/changelog.

Revision history for this message
Mohamed Amine Ilidrissi (ilidrissi.amine) wrote :

The second patch has been reverted, you can merge now :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py 2010-08-10 18:22:15 +0000
+++ UpdateManager/Core/MyCache.py 2010-08-10 21:21:43 +0000
@@ -92,6 +92,8 @@
92 @property92 @property
93 def installCount(self):93 def installCount(self):
94 return self._depcache.inst_count94 return self._depcache.inst_count
95 def keepCount(self):
96 return self._depcache.keep_count
95 def saveDistUpgrade(self):97 def saveDistUpgrade(self):
96 """ this functions mimics a upgrade but will never remove anything """98 """ this functions mimics a upgrade but will never remove anything """
97 self._depcache.upgrade(True)99 self._depcache.upgrade(True)
98100
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py 2010-08-10 15:35:41 +0000
+++ UpdateManager/UpdateManager.py 2010-08-10 21:21:43 +0000
@@ -553,8 +553,9 @@
553 if num_updates == 0:553 if num_updates == 0:
554 text_header= "<big><b>%s</b></big>" % _("Your system is up-to-date")554 text_header= "<big><b>%s</b></big>" % _("Your system is up-to-date")
555 self.label_downsize.set_text("\n")555 self.label_downsize.set_text("\n")
556 self.notebook_details.set_sensitive(False)556 if not self.cache.keepCount == 0:
557 self.treeview_update.set_sensitive(False)557 self.notebook_details.set_sensitive(False)
558 self.treeview_update.set_sensitive(False)
558 self.button_install.set_sensitive(False)559 self.button_install.set_sensitive(False)
559 self.button_close.grab_default()560 self.button_close.grab_default()
560 self.textview_changes.get_buffer().set_text("")561 self.textview_changes.get_buffer().set_text("")
561562
=== modified file 'debian/changelog'
--- debian/changelog 2010-08-10 18:22:15 +0000
+++ debian/changelog 2010-08-10 21:21:43 +0000
@@ -4,6 +4,8 @@
4 * Cache is no 4 * Cache is no
5 longer initialized when an operation is not authorized.5 longer initialized when an operation is not authorized.
6 LP: #3946086 LP: #394608
7 * List of updates is active when there are only kept packages.
8 LP: #601127 (thanks, Nicolò Chieffo)
7 9
8 [ Michael Vogt ]10 [ Michael Vogt ]
9 * merged lp:~simono/update-manager/fixes-bug-563640, many thanks11 * merged lp:~simono/update-manager/fixes-bug-563640, many thanks

Subscribers

People subscribed via source and target branches

to status/vote changes: