[elbe-devel] [PATCH] elbeproject: invert repo action after package build

[Kory Maincent]

Remove package in the repo before including it, not the contrary.

Signed-off-by: Kory Maincent <kory.maincent at bootlin.com>
---
 elbepack/elbeproject.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index 02132bde8..228dac042 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -723,10 +723,7 @@ class ElbeProject (object):
                        os.path.join(self.builddir, "pbuilder_cross", "base.tgz"),
                        os.path.join(self.builddir, "pbuilder_cross", "result")),
                    env_add={'DEB_BUILD_PROFILES': profile.replace(",", " ")})
-                self.repo.include(os.path.join(self.builddir,
-                                               "pbuilder_cross",
-                                               "result",
-                                               "*.changes"))
+                pbuilderdir = "pbuilder_cross"
             else:
                 do('cd "%s"; %s pdebuild --debbuildopts "-j%s -sa" '
                    '--configfile "%s" '
@@ -737,10 +734,7 @@ class ElbeProject (object):
                        os.path.join(self.builddir, "pbuilderrc"),
                        os.path.join(self.builddir, "pbuilder", "result")),
                    env_add={'DEB_BUILD_PROFILES': profile.replace(",", " ")})
-                self.repo.include(os.path.join(self.builddir,
-                                               "pbuilder",
-                                               "result",
-                                               "*.changes"))
+                pbuilderdir = "pbuilder"
 
             self.repo.remove(os.path.join(self.builddir,
                                           "pdebuilder",
@@ -748,6 +742,10 @@ class ElbeProject (object):
                                           "debian",
                                           "control"))
 
+            self.repo.include(os.path.join(self.builddir,
+                                               pbuilderdir,
+                                               "result",
+                                               "*.changes"))
         except CommandError:
             logging.exception("Package fails to build.\n"
                               "Please make sure, that the submitted package "
-- 
2.17.1