Merge ~racb/git-ubuntu:nacc-breakdown/run-quilt-gbp-correctly into git-ubuntu:master

[Robie Basak]

[Robie Basak (racb)]

Why are --git-nopbuilder and --git-no-qemubuilder being removed from the gbp call?

Why are env=self.env parameters being added?

review: Needs Information

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:ca2210f7a778bc0a0aac7df37d7db7874eca2633
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~racb/usd-importer/+git/usd-importer/+merge/336308/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/249/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    FAILED: Integration Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/249/rebuild

review: Needs Fixing (continuous-integration)

[Nish Aravamudan (nacc)]

Superseded with my merge

diff --git a/gitubuntu/git_repository.py b/gitubuntu/git_repository.py
index a42063e..b6ee2f2 100644
--- a/gitubuntu/git_repository.py
+++ b/gitubuntu/git_repository.py
@@ -21,7 +21,13 @@ import gitubuntu.lint
 from gitubuntu.__main__ import top_level_defaults
 import gitubuntu.build
 from gitubuntu.dsc import component_tarball_matches
-from gitubuntu.run import run, runq, decode_binary
+from gitubuntu.run import (
+   decode_binary,
+   run,
+   runq,
+   run_gbp,
+   run_quilt,
+)
 try:
     pkg = 'python3-debian'
     import debian.changelog
@@ -918,8 +924,7 @@ class GitUbuntuRepository:
             tarballs.append(
                 os.path.join(os.path.pardir, potential_main_tarballs[0])
             )
-            cmd = ['gbp', 'buildpackage', '--git-no-pbuilder',
-                   '--git-no-qemubuilder', '--git-builder=/bin/true',
+            args = ['buildpackage', '--git-builder=/bin/true',
                    '--git-pristine-tar', '--git-ignore-branch',
                    '--git-upstream-tag=%s/upstream/%s/%%(version)s%s' %
                    (namespace, dist, ext)]
@@ -936,11 +941,11 @@ class GitUbuntuRepository:
             tarballs.extend(map(lambda x : os.path.join(os.path.pardir, x),
                 list(potential_component_tarballs.values()))
             )
-            cmd.extend(map(lambda x : '--git-component=%s' % x,
+            args.extend(map(lambda x : '--git-component=%s' % x,
                 list(potential_component_tarballs.keys()))
             )
             with self.pristine_tar_branches(dist, namespace):
-                run(cmd)
+                run_gbp(args, env=self.env)
             return tarballs
 
         raise PristineTarNotFoundError(
@@ -1973,8 +1978,8 @@ class GitUbuntuRepository:
         # differentiate between applied an unapplied
         with self.temporary_worktree(commit_hash):
             try:
-                run(
-                    ['quilt', 'push', '-a'],
+                run_quilt(
+                    ['push', '-a'],
                     env=self.quilt_env_from_treeish_str(commit_hash),
                 )
                 # False if in an unapplied state, which is signified by
@@ -1999,8 +2004,8 @@ class GitUbuntuRepository:
                         raise e
 
                     try:
-                        run(
-                            ['quilt', 'push', '-a'],
+                        run_quilt(
+                            ['push', '-a'],
                             env=self.quilt_env_from_treeish_str(commit_hash),
                         )
                         # False if in an unapplied state
@@ -2095,8 +2100,8 @@ class GitUbuntuRepository:
                 )
 
                 # generate the equivalent .pc directory
-                run(
-                    ['quilt', 'push', '-a'],
+                run_quilt(
+                    ['push', '-a'],
                     env=self.quilt_env_from_treeish_str(commit_hash),
                     rcs=[2],
                 )
@@ -2279,14 +2284,14 @@ with other relevant fields (see below for details).
             'debian/changelog',
         ):
             with self.temporary_worktree(commit_hash):
-                run(
+                run_gbp(
                     [
-                        'gbp',
                         'dch',
                         '--snapshot',
                         '--ignore-branch',
                         '--since=%s' % str(parent_ref),
-                    ]
+                    ],
+                    env=self.env,
                 )
                 return self.dir_to_tree('.')
 
diff --git a/gitubuntu/importer.py b/gitubuntu/importer.py
index e8fb4f8..2eef775 100644
--- a/gitubuntu/importer.py
+++ b/gitubuntu/importer.py
@@ -53,7 +53,13 @@ from gitubuntu.git_repository import (
     PristineTarError,
     is_dir_3_0_quilt,
 )
-from gitubuntu.run import decode_binary, run, runq
+from gitubuntu.run import (
+    decode_binary,
+    run,
+    runq,
+    run_gbp,
+    run_quilt,
+)
 from gitubuntu.source_information import (
     GitUbuntuSourceInformation,
     NoPublicationHistoryException,
@@ -686,17 +692,17 @@ def import_orig(repo, dsc, namespace, version, dist):
             ext = os.path.splitext(dsc.orig_tarball_path)[1]
 
             # make this non-fatal if upstream already exist as tagged?
-            cmd = ['gbp', 'import-orig', '--no-merge',
+            args = ['import-orig', '--no-merge',
                  '--upstream-branch', 'do-not-push',
                  '--pristine-tar', '--no-interactive',
                  '--no-symlink-orig',
                  '--upstream-tag=%s/upstream/%s/%%(version)s%s' %
                      (namespace, dist, ext)]
-            cmd.extend(map(lambda x: '--component=%s' % x,
+            args.extend(map(lambda x: '--component=%s' % x,
                 list(orig_component_paths.keys()))
             )
-            cmd.extend([orig_tarball_path,])
-            run(cmd, env=repo.env)
+            args.extend([orig_tarball_path,])
+            run_gbp(args, env=repo.env)
     except CalledProcessError as e:
         raise GitUbuntuImportOrigError(
             'Unable to import tarballs: %s' % orig_paths
@@ -783,18 +789,18 @@ def import_patches_applied_tree(repo, dsc_pathname):
         while True:
             try:
                 os.chdir(extracted_dir)
-                run(
-                    ['quilt', 'push'],
+                run_quilt(
+                    ['push'],
                     env=repo.quilt_env_from_treeish_str(import_tree_hash),
                     verbose_on_failure=False,
                 )
-                patch_name, _ = run(
-                    ['quilt', 'top'],
+                patch_name, _ = run_quilt(
+                    ['top'],
                     env=repo.quilt_env_from_treeish_str(import_tree_hash),
                 )
                 patch_name = patch_name.strip()
-                header, _  = run(
-                    ['quilt', 'header'],
+                header, _  = run_quilt(
+                    ['header'],
                     env=repo.quilt_env_from_treeish_str(import_tree_hash),
                 )
                 header = header.strip()
diff --git a/gitubuntu/run.py b/gitubuntu/run.py
index 4b1a86c..1fdcd6d 100644
--- a/gitubuntu/run.py
+++ b/gitubuntu/run.py
@@ -1,4 +1,5 @@
 import logging
+import os
 import subprocess
 
 
@@ -102,3 +103,17 @@ def decode_binary(binary, verbose=True):
             logging.warning("Failed to decode blob: %s", e)
             logging.warning("blob=%s", binary.decode(errors='replace'))
         return binary.decode('utf-8', errors='replace')
+
+def run_quilt(args, env=None, **kwargs):
+    cmd = ['quilt', '--quiltrc', '-'] + args
+    return run(cmd, env=env, **kwargs)
+
+def run_gbp(args, env=None, **kwargs):
+    cmd = ['gbp'] + args
+    if env:
+        env_no_gbp_conf = env.copy()
+    else:
+        env_no_gbp_conf = os.environ.copy()
+    env_no_gbp_conf['GBP_CONF_FILES'] = '/dev/null'
+
+    return run(cmd, env=env_no_gbp_conf, **kwargs)