From 5828c89d60243fdea81b7492af0290fded52a064 Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Mon, 19 Nov 2012 14:30:00 +0800 Subject: [PATCH] Support pristine-tar when generate tarball Because gbs based on local upstream and pristine-tar branch, not remote, to support pristine-tar. So checkout these two branches before gbs export. Change-Id: I1340497f6cc702be650fbea465f6a291342f5255 Signed-off-by: Lin Yang --- job_submitobs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/job_submitobs.py b/job_submitobs.py index cf78271..e1f1147 100755 --- a/job_submitobs.py +++ b/job_submitobs.py @@ -328,6 +328,12 @@ def main(): msg = 'Submitter: %s <%s>\nComments: %s\nGit project: %s\nTag: %s\nCommit: %s %s' % (tagger['author'], tagger['email'], tagger['message'], GERRIT_PROJECT, tag, commitinfo['id'], commitinfo['subject']) + # to support pristine-tar, checkout upstream and pristine-tar branch to local + if mygit.has_branch('origin/upstream', remote=True): + mygit.checkout('upstream') + if mygit.has_branch('origin/pristine-tar', remote=True): + mygit.checkout('pristine-tar') + # checkout submit tag mygit.checkout(tag) for target in obstargets: -- 2.7.4