launchpad-reviewers team mailing list archive

[Colin Watson <mp+454266@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-bugbear-unused-loop-variables into launchpad:master.

Commit message:
Fix test failures caused by "Remove/rename unused loop variables"

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/454266
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-bugbear-unused-loop-variables into launchpad:master.

diff --git a/lib/lp/services/librarianserver/librariangc.py b/lib/lp/services/librarianserver/librariangc.py
index 1f362e6..1cec619 100644
--- a/lib/lp/services/librarianserver/librariangc.py
+++ b/lib/lp/services/librarianserver/librariangc.py
@@ -316,7 +316,7 @@ def merge_duplicates(con):
                 UPDATE LibraryFileAlias SET content=%(prime_id)s
                 WHERE content = %(other_id)s
                 """,
-                {"other_id": other_id},
+                {"prime_id": prime_id, "other_id": other_id},
             )
         prime_count += 1
         dupe_count += len(dupes)
diff --git a/lib/lp/translations/tests/test_translationsplitter.py b/lib/lp/translations/tests/test_translationsplitter.py
index 83e7d43..f2c591b 100644
--- a/lib/lp/translations/tests/test_translationsplitter.py
+++ b/lib/lp/translations/tests/test_translationsplitter.py
@@ -71,7 +71,7 @@ class TestTranslationSplitter(TestCaseWithFactory):
         shared = list(splitter.findShared())
         for upstream, ubuntu in shared:
             self.assertEqual(upstream.potmsgset, ubuntu.potmsgset)
-        self.assertEqual(1, len(shared))
+        self.assertEqual(2, len(shared))
 
     def test_splitPOTMsgSet(self):
         """Splitting a POTMsgSet clones it and updates TemplateItem."""