qitoolchain: fix breakage introduced by post_add

The post_add method was calling method "load_package_xml", which was overriding variables written by method "reroot_path". Remove the call to load_package_xml in qipackage, as it is always called in database.py before calling post_add. The API is rather brittle, let's fix it in a subsequent commit Change-Id: I0f9b4012bc368eb66b882fb50b0f2a0ae3f9d870 Reviewed-on: http://gerrit.aldebaran.lan/78081 Reviewed-by: plemagourou <[email protected]> Tested-by: gerrit
aldebaran · Dec 9, 2016 · a394072 · a394072
1 parent 6bb5b98
commit a394072
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/python/qitoolchain/qipackage.py b/python/qitoolchain/qipackage.py
@@ -210,9 +210,6 @@ def post_add(self):
             * CommandFailedException if the post-add script fails
         """
 
-        # Make sure the post-add is loaded
-        self.load_package_xml()
-
         if not self._post_add:
             return
 

diff --git a/python/qitoolchain/test/test_qipackage.py b/python/qitoolchain/test/test_qipackage.py
@@ -194,6 +194,7 @@ def test_post_add_does_not_exist(tmpdir):
 """)
 
     package = qitoolchain.qipackage.QiPackage("boost", path=boost_path.strpath)
+    package.load_package_xml()
 
     # pylint: disable-msg=E1101
     with pytest.raises(qisys.command.NotInPath):
@@ -215,6 +216,7 @@ def test_post_add(tmpdir):
     os.chmod(script.strpath, 0755)
 
     package = qitoolchain.qipackage.QiPackage("boost", path=boost_path.strpath)
+    package.load_package_xml()
 
     package.post_add()