Merge lp:~ubuntu-branches/ubuntu/raring/juju/raring-201304221742 into lp:ubuntu/raring/juju

[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/raring/juju reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/juju/raring-201304221742. 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

28. By Clint Byrum on 2012-12-03

d/juju.docs: Remove examples as they have been dropped upstream.

27. By Clint Byrum on 2012-11-06

d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.

26. By Clint Byrum on 2012-11-06

d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-04-10 13:57:21 +0000
+++ .pc/applied-patches	2013-04-22 17:51:22 +0000
@@ -1,2 +1,5 @@
 disable-failing-zookeeper-test.patch
+<<<<<<< TREE
 workaround-lxc-python-env.patch
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-10 13:57:21 +0000
+++ debian/changelog	2013-04-22 17:51:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 juju (0.7-0ubuntu1) raring; urgency=low
 
   [ Clint Byrum ]
@@ -17,6 +18,16 @@
 
  -- Martin Packman <[e-mail]>  Wed, 10 Apr 2013 13:57:21 +0000
 
+=======
+juju (0.6-1ubuntu2) UNRELEASED; urgency=low
+
+  * d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.
+  * d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.
+  * d/juju.docs: Remove examples as they have been dropped upstream.
+
+ -- Clint Byrum <[e-mail]>  Tue, 06 Nov 2012 12:14:23 -0800
+
+>>>>>>> MERGE-SOURCE
 juju (0.6-1ubuntu1) quantal; urgency=low
 
   * d/patches/maas-tag-conversion.patch: Fix maas provider api usage

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-04-10 13:57:21 +0000
+++ debian/patches/series	2013-04-22 17:51:22 +0000
@@ -1,2 +1,5 @@
 disable-failing-zookeeper-test.patch
+<<<<<<< TREE
 workaround-lxc-python-env.patch
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'juju/charm/tests/test_directory.py'
--- juju/charm/tests/test_directory.py	2013-04-10 13:57:21 +0000
+++ juju/charm/tests/test_directory.py	2013-04-22 17:51:22 +0000
@@ -211,8 +211,12 @@
 
     def test_internal_symlink(self):
         charm_path = self.copy_charm()
+<<<<<<< TREE
         external_file = self.makeFile(content='baz')
         os.symlink(external_file, os.path.join(charm_path, "foobar"))
+=======
+        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+>>>>>>> MERGE-SOURCE
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)
@@ -220,8 +224,12 @@
 
     def test_extract_symlink(self):
         charm_path = self.copy_charm()
+<<<<<<< TREE
         external_file = self.makeFile(content='lorem ipsum')
         os.symlink(external_file, os.path.join(charm_path, "foobar"))
+=======
+        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+>>>>>>> MERGE-SOURCE
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)

=== modified file 'juju/providers/maas/provider.py'
--- juju/providers/maas/provider.py	2013-04-10 13:57:21 +0000
+++ juju/providers/maas/provider.py	2013-04-22 17:51:22 +0000
@@ -37,10 +37,9 @@
     def convert(self, tag_expression):
         """Extract set of names in tag_expression checking they all exist"""
         tags = set()
-        stripped_expression = tag_expression
         for c in (",", "&", "|", "!"):
-            stripped_expression = stripped_expression.replace(c, " ")
-        for word in stripped_expression.strip().split():
+            tag_expression = tag_expression.replace(c, " ")
+        for word in tag_expression.strip().split():
             tag = word.lower()
             if tag not in self.tag_names:
                 raise ValueError("tag %r does not exist" % (tag,))

=== modified file 'juju/providers/maas/tests/test_provider.py'
--- juju/providers/maas/tests/test_provider.py	2013-04-10 13:57:21 +0000
+++ juju/providers/maas/tests/test_provider.py	2013-04-22 17:51:22 +0000
@@ -191,6 +191,7 @@
         provider.maas_client = mock_client
         cs = yield provider.get_constraint_set()
         bear = cs.parse(["maas-tags=clawed, furry"])
+<<<<<<< TREE
 
         # Incomplete constraints (no series) can't satisify
         self.assertFalse(bear.can_satisfy(bear))
@@ -199,6 +200,10 @@
 
         err = self.assertRaises(
             ConstraintError,
+=======
+        bear.can_satisfy(bear)
+        err = self.assertRaises(ConstraintError,
+>>>>>>> MERGE-SOURCE
             cs.parse, ["maas-tags=furry, bouncy"])
 
         self.assertEqual(