Merge lp:~dpm/ubuntu/lucid/gdebi/bug-403632 into lp:ubuntu/lucid/gdebi

Proposed by David Planella on 2010-02-11
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~dpm/ubuntu/lucid/gdebi/bug-403632
Merge into: lp:ubuntu/lucid/gdebi
Diff against target: 23 lines (+3/-3)
1 file modified
GDebi/DebPackage.py (+3/-3)
To merge this branch: bzr merge lp:~dpm/ubuntu/lucid/gdebi/bug-403632
Reviewer Review Type Date Requested Status
Michael Vogt Approve on 2010-02-25
David Planella (community) Resubmit on 2010-02-11
Ubuntu branches 2010-02-11 Pending
Review via email: mp+19082@code.launchpad.net
To post a comment you must log in.
David Planella (dpm) wrote :

Merge proposal with a fix for bug 403632

David Planella (dpm) wrote :

Resubmitting for review, the previous commit missed the removal of the original line containing the string

review: Resubmit
22. By David Planella on 2010-02-11

Removed additional line left from the last fix

Michael Vogt (mvo) wrote :

Merged, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GDebi/DebPackage.py'
2--- GDebi/DebPackage.py 2009-10-02 18:56:30 +0000
3+++ GDebi/DebPackage.py 2010-02-11 17:49:12 +0000
4@@ -275,8 +275,8 @@
5 if dep.name == self.pkgName:
6 if not apt_pkg.CheckDep(debver,dep.relation,dep.version):
7 self._dbg(2, "would break (depends) %s" % pkg.name)
8- # TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the releation (e.g. >=) and the latest the version for the releation
9- self._failureString += _("Breaks existing package '%s' dependency %s (%s %s)\n") % (pkg.name, dep.name, dep.relation, dep.version)
10+ # TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
11+ self._failureString += _("Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %i(depversion)s)\n") % {'pkgname' : pkg.name, 'depname' : dep.name, 'deprelation' : dep.relation, 'depversion' : dep.version}
12 self._cache.op_progress.done()
13 return False
14 # now check if there are conflicts against this package on
15@@ -288,7 +288,7 @@
16 if apt_pkg.CheckDep(debver, cOr.CompType, cOr.TargetVer):
17 self._dbg(2, "would break (conflicts) %s" % pkg.name)
18 # TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
19- self._failureString += _("Breaks exisiting package '%s' conflict: %s (%s %s)\n") % (pkg.name, cOr.TargetPkg.Name, cOr.CompType, cOr.TargetVer)
20+ self._failureString += _("Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %(targetver)s)\n") % {'pkgname' : pkg.name, 'targetpkg' : cOr.TargetPkg.Name, 'comptype' : cOr.CompType, 'targetver' : cOr.TargetVer}
21 self._cache.op_progress.done()
22 return False
23 self._cache.op_progress.done()

Subscribers

People subscribed via source and target branches

to all changes: