You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/11/18 22:05:59 UTC
zookeeper git commit: ZOOKEEPER-2632: Add option to inform
JIRA_PASSWORD at CLI prompt (Edward Ribeiro via phunt)
Repository: zookeeper
Updated Branches:
refs/heads/master 179c8db6d -> d310d45bb
ZOOKEEPER-2632: Add option to inform JIRA_PASSWORD at CLI prompt (Edward Ribeiro via phunt)
Change-Id: I4b2afec4c10623945d9337e4df8d3313496979ae
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/d310d45b
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/d310d45b
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/d310d45b
Branch: refs/heads/master
Commit: d310d45bb938852c332646ccc2202091b9e472c8
Parents: 179c8db
Author: Patrick Hunt <ph...@apache.org>
Authored: Fri Nov 18 14:04:03 2016 -0800
Committer: Patrick Hunt <ph...@apache.org>
Committed: Fri Nov 18 14:04:03 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +++
zk-merge-pr.py | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d310d45b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 01ed27b..7b9c847 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -544,6 +544,9 @@ IMPROVEMENTS:
ZOOKEEPER-2631: Make issue extraction in the git pull request script
more robust (Flavio P. Junqueira via rgs)
+ ZOOKEEPER-2632: Add option to inform JIRA_PASSWORD at CLI prompt
+ (Edward Ribeiro via phunt)
+
Release 3.5.0 - 8/4/2014
NEW FEATURES:
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d310d45b/zk-merge-pr.py
----------------------------------------------------------------------
diff --git a/zk-merge-pr.py b/zk-merge-pr.py
index 1b49dcc..5768a94 100644
--- a/zk-merge-pr.py
+++ b/zk-merge-pr.py
@@ -33,6 +33,7 @@ import re
import subprocess
import sys
import urllib2
+import getpass
try:
import jira.client
@@ -412,21 +413,32 @@ def check_git_remote():
def check_jira_env():
+
+ global JIRA_PASSWORD
+
if JIRA_IMPORTED:
+
+ if JIRA_USERNAME.strip() != "" and JIRA_PASSWORD.strip() == "":
+ inform_pwd = raw_input("JIRA_USERNAME set but JIRA_PASSWORD is not. Want to inform it? ")
+ if inform_pwd.strip() == "y":
+ JIRA_PASSWORD = getpass.getpass('JIRA PASSWORD: ')
+
if JIRA_USERNAME.strip() == "" or JIRA_PASSWORD.strip() == "":
- msg ="JIRA credentials are not set. Want to continue?"
+ msg ="JIRA_USERNAME and/or JIRA_PASSWORD are not set. Want to continue? "
continue_maybe(msg)
-
+ else:
+ msg = "JIRA lib not installed. Want to continue? "
+ continue_maybe(msg)
def main():
global original_head
original_head = get_current_branch()
-
+
check_jira_env()
check_git_remote()
-
+
branches = get_json("%s/branches" % GITHUB_API_BASE)
branch_names = filter(lambda x: x.startswith(RELEASE_BRANCH_PREFIX), [x['name'] for x in branches])
# Assumes branch names can be sorted lexicographically