Merge ~nacc/git-ubuntu:lp1713530-pass-v-to-dpkg-buildpackage-for-merges into git-ubuntu:master

[Nish Aravamudan]

Make jenkins happy.

Still needs to be tested.

[Nish Aravamudan (nacc)]

Tested with a trivial merge of openexr, but would like more exposure.

[Nish Aravamudan (nacc)]

I think we should consolidate our 'merge detection' logic into one place (perhaps in git_repository if HEAD (could be commitish, but unclear if that's generally needed -- and how to differentiate between a bugfix to a debian version and a merge?) changelog is for ubuntu, but the nearest remote pkg/ remote branch is debian?

[Nish Aravamudan (nacc)]

If we do consolidate, we'll need to refactor the followon branches (either this one or the LXD one) to use that logic.

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

PASSED: Continuous integration, rev:fe328d3828cdfde52106cf7c3edc88cfd621c387
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/92/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:70794e49463bd4b94452d1ebf714441bf55b92c6
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/132/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

[Andreas Hasenack (ahasenack)]

I didn't know about -v, interesting.

ok, verified that it's passing the old/ubuntu version via -v when it's a debian merge, and that a command line -- -v<version> overrides that, also in lxc builds, and the .changes file has the expected changelog entries.

review: Approve

[Nish Aravamudan (nacc)]

Self-approving

review: Approve

diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 68a619d..74db6c8 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -435,6 +435,24 @@ def main(
         return []
 
     try:
+        repo = GitUbuntuRepository('.')
+        pkg_remote_branch_string = derive_target_branch(repo, 'HEAD')
+        if len(pkg_remote_branch_string) == 0:
+            sys.exit(1)
+
+        # Implies a merge
+        if 'debian' in pkg_remote_branch_string:
+            oldubuntu_version, _ = repo.get_changelog_versions_from_treeish(
+                'pkg/ubuntu/devel',
+            )
+            if all('-v' not in arg for arg in rem_args):
+                rem_args.extend(['-v', oldubuntu_version,])
+            else:
+                logging.warning(
+                    "-v specified manually, not passing -v%s automatically",
+                    oldubuntu_version,
+                )
+
         files = fetch_orig_and_build(
             search_list,
             changelog,