import_dsc: delay pristine-tar import to the very end

This makes sure we have a sane debian and upstream branch already so we
don't leave the repo in an inconsistent state in case of failure.

Closes: #851287

1 files changed, 4 insertions, 4 deletions

diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 8ee59d52..add95606 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -471,10 +471,6 @@ def main(argv):
             if not src.native:
                 if is_empty:
                     repo.create_branch(options.upstream_branch, commit)
-                if options.pristine_tar:
-                    repo.create_pristinetar_commits(options.upstream_branch,
-                                                    src.tgz,
-                                                    src.additional_tarballs.items())
             if (not repo.has_branch(options.debian_branch) and
                     (is_empty or options.create_missing_branches)):
                 repo.create_branch(options.debian_branch, commit)
@@ -487,6 +483,10 @@ def main(argv):
         if repo.get_branch() == options.debian_branch or is_empty:
             # Update HEAD if we modified the checked out branch
             repo.force_head(options.debian_branch, hard=True)
+        if options.pristine_tar and not src.native:
+            repo.create_pristinetar_commits(options.upstream_branch,
+                                            src.tgz,
+                                            src.additional_tarballs.items())
     except KeyboardInterrupt:
         ret = 1
         gbp.log.err("Interrupted. Aborting.")