Merge lp:~ubuntu-branches/ubuntu/precise/software-properties/precise-proposed-201312210113 into lp:ubuntu/precise-proposed/software-properties

Proposed by Ubuntu Package Importer on 2013-12-21
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/software-properties/precise-proposed-201312210113
Merge into: lp:ubuntu/precise-proposed/software-properties
Diff against target: 11 lines (+1/-0)
1 file modified
softwareproperties/gtk/SoftwarePropertiesGtk.py (+1/-0)
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/software-properties/precise-proposed-201312210113
Reviewer Review Type Date Requested Status
Ubuntu Development Team 2013-12-21 Pending
Review via email: mp+199890@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise-proposed/software-properties reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/software-properties/precise-proposed-201312210113. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

94. By Brian Murray on 2013-12-06

Ensure package sources are refreshed after modification. Thanks to
Bruno Nova for the patch. (LP: #1075537)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
2--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2013-12-06 15:46:28 +0000
3+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2013-12-21 01:21:25 +0000
4@@ -747,6 +747,7 @@
5 """The config was changed and now needs to be saved and reloaded"""
6 apt.apt_pkg.init_config()
7 self.button_revert.set_sensitive(True)
8+ self.modified_sourceslist = True
9
10 def on_keys_modified(self):
11 """ The apt keys have changed and need to be redisplayed """

Subscribers

People subscribed via source and target branches

to all changes: