[Asterisk-code-review] mkrelease: Fix invocation of prep tarball (repotools[master])

[Matt Jordan]

Matt Jordan has submitted this change and it was merged.

Change subject: mkrelease: Fix invocation of prep_tarball
......................................................................


mkrelease: Fix invocation of prep_tarball

The prep_tarball script in the Asterisk project expects to be called
with the mainline Asterisk branch the release is being based on, e.g.,
'11', '13', 'certified/1.8.11', etc. Currently, the script is being
invoked with the working release branch, which *may* be the same as the
mainline branch (for Certified releases) but is much more likely to be a
working tag branch, such as 11.19 or 13.5. If invoked with the working
tag branch name, the script will fail to retrieve the wiki
documentation.

This patch updates mkrelease to track the mainline branch the release is
being made from, and call the script with that name.

Change-Id: Iec2912c7810a5bed9102ae3234f40435092221e1
---
M mkrelease.py
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/mkrelease.py b/mkrelease.py
index 6fec6b1..a3c8c5d 100755
--- a/mkrelease.py
+++ b/mkrelease.py
@@ -52,6 +52,8 @@
 # The working branch for the release
 branch = None
 
+# The mainline branch that the working branch is based off of
+mainline = None
 
 class ExitException(Exception):
     """Exception raised by prompt_to_continue to stop the script"""
@@ -134,6 +136,7 @@
     repo    - The prepared repo
     """
     global branch
+    global mainline
 
     if version_object.prefix:
         mainline = '{0}/{1}.{2}'.format(version_object.prefix,
@@ -551,8 +554,8 @@
         """
         curdir = os.getcwd()
         os.chdir(path)
-        dprint("Running build_tools/prep_tarball")
-        os.system('./build_tools/prep_tarball {0}'.format(branch))
+        dprint("Running build_tools/prep_tarball with {0}".format(mainline))
+        os.system('./build_tools/prep_tarball {0}'.format(mainline))
         os.chdir(curdir)
 
     def create_archive(path):

-- 
To view, visit https://gerrit.asterisk.org/971
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec2912c7810a5bed9102ae3234f40435092221e1
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>