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

[David Planella]

[David Planella (dpm)]

Merge proposal with a fix for bug 403632

[David Planella (dpm)]

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

review: Needs Resubmitting

[lp:~dpm/ubuntu/lucid/gdebi/bug-403632]

22. By David Planella on 2010-02-11

Removed additional line left from the last fix

[Michael Vogt (mvo)]

Merged, thanks!

review: Approve

=== modified file 'GDebi/DebPackage.py'
--- GDebi/DebPackage.py	2009-10-02 18:56:30 +0000
+++ GDebi/DebPackage.py	2010-02-11 17:49:12 +0000
@@ -275,8 +275,8 @@
                     if dep.name == self.pkgName:
                         if not apt_pkg.CheckDep(debver,dep.relation,dep.version):
                             self._dbg(2, "would break (depends) %s" % pkg.name)
-                            # 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
-                            self._failureString += _("Breaks existing package '%s' dependency %s (%s %s)\n") % (pkg.name, dep.name, dep.relation, dep.version)
+                            # 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
+                            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}
                             self._cache.op_progress.done()
                             return False
             # now check if there are conflicts against this package on
@@ -288,7 +288,7 @@
                             if apt_pkg.CheckDep(debver, cOr.CompType, cOr.TargetVer):
                                 self._dbg(2, "would break (conflicts) %s" % pkg.name)
 				# 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
-                                self._failureString += _("Breaks exisiting package '%s' conflict: %s (%s %s)\n") % (pkg.name, cOr.TargetPkg.Name, cOr.CompType, cOr.TargetVer)
+                                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}
                                 self._cache.op_progress.done()
                                 return False
         self._cache.op_progress.done()