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

[Bastian Germann]

Am 02.09.20 um 16:22 schrieb Torben Hohn:
> From: Kory Maincent <kory.maincent at bootlin.com>
> 
> Remove package in the repo before including it, not the contrary.
> 
> Signed-off-by: Kory Maincent <kory.maincent at bootlin.com>
> Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>
> [torbenh: rebased from 411a9405030d ("pbuilder: Adjust create_pbuilder and pdebuild_build") onto a50b9b351d4a ("debianize: kernel: libc: Reference correct headers")]
> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>

Reviewed-by: Bastian Germann <bage at linutronix.de>

> ---
>  elbepack/elbeproject.py | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index 5ab86b540..71cbbb1ff 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -785,10 +785,7 @@ class ElbeProject (object):
>                         os.path.join(self.builddir, "pbuilder_cross", "result")),
>                     env_add={'DEB_BUILD_PROFILES': profile.replace(",", " "),
>                              'DEB_BUILD_OPTIONS': " ".join(deb_build_opts)})
> -                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" '
> @@ -799,10 +796,7 @@ class ElbeProject (object):
>                         os.path.join(self.builddir, "pbuilder", "result")),
>                     env_add={'DEB_BUILD_PROFILES': profile.replace(",", " "),
>                              'DEB_BUILD_OPTIONS': " ".join(deb_build_opts)})
> -                self.repo.include(os.path.join(self.builddir,
> -                                               "pbuilder",
> -                                               "result",
> -                                               "*.changes"))
> +                pbuilderdir = "pbuilder"
>  
>              self.repo.remove(os.path.join(self.builddir,
>                                            "pdebuilder",
> @@ -810,6 +804,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 "
>