Merge lp:~ubuntu-branches/ubuntu/utopic/apt-clone/utopic-201408202222 into lp:ubuntu/utopic/apt-clone

[Ubuntu Package Importer]

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/utopic/apt-clone reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/utopic/apt-clone/utopic-201408202222. 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)

Unmerged revisions

30. By Brian Murray on 2014-08-20

add in missing test for bug 1309447

29. By Brian Murray on 2014-08-20

incorporate upstream changes from r146 to r148

=== added file 'tests/test_lp1309447.py'
--- tests/test_lp1309447.py	1970-01-01 00:00:00 +0000
+++ tests/test_lp1309447.py	2014-08-20 22:30:36 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+from __future__ import print_function
+
+import os
+import sys
+import unittest
+
+# this is important
+os.environ["LANG"] = "C"
+
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+from apt_clone import AptClone
+
+
+class MockTar(object):
+    def add(self, source, arcname):
+        with open(source, "rb") as f:
+            self.data = f.read().decode("utf-8")
+
+
+class TestClone(unittest.TestCase):
+
+    def setUp(self):
+        self.apt_clone = AptClone()
+        self.test_sources_fname = "test-sources.list"
+        with open(self.test_sources_fname, "wb") as f:
+            f.write(u"""# äüö
+deb http://mvo:secret@archive.u.c/ ubuntu main
+""".encode("utf-8"))
+
+    def tearDown(self):
+        os.unlink(self.test_sources_fname)
+
+    def test_scrub_file_from_passwords(self):
+        """Regression test for utf8 crash LP: #1309447"""
+        mock_tar = MockTar()
+        self.apt_clone._add_file_to_tar_with_password_check(
+            mock_tar, self.test_sources_fname, scrub=True, 
+            arcname="some-archname")
+        # see if we got the expected data
+        self.assertNotIn("mvo:secret", mock_tar.data)
+        self.assertEqual(mock_tar.data, u"""# äüö
+deb http://USERNAME:PASSWORD@archive.u.c/ ubuntu main
+""")
+
+
+if __name__ == "__main__":
+    unittest.main()