diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-15 18:43:26 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-15 18:44:09 +0200 |
| commit | b216450244d73225b590b2b6f27ea74840ede6a4 (patch) | |
| tree | 2e546e21797bb33732ba8902c71c74f34c8ed6cd | |
| parent | cbed6de3f2e5915370c2a5ea1ad4bb1dd74c5c43 (diff) | |
| download | NetworkManager-b216450244d73225b590b2b6f27ea74840ede6a4.tar.gz | |
contrib/bkr: use rhel-7.1 branch wherever appropriate
| -rwxr-xr-x | contrib/rh-bkr/bkr.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py index 88d5827843..cd6e522e6b 100755 --- a/contrib/rh-bkr/bkr.py +++ b/contrib/rh-bkr/bkr.py @@ -579,21 +579,21 @@ class CmdSubmit(CmdBase): if re.match(r'^.*/NetworkManager-0.9.9.1-[1-9][0-9]*\.git20140326\.4dba720\.el7\.x86_64\.rpm$', u): return 'rhel-7.0' # stable rhel-7.0 release if re.match(r'^.*/NetworkManager-0.9.11.0-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # upstream pre 1.0 + return 'rhel-7.1' # upstream pre 1.0 if re.match(r'^.*/NetworkManager-0.9[0-9][0-9]+.0.0-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # upstream 1.0-beta + return 'rhel-7.1' # upstream 1.0-beta if re.match(r'^.*/NetworkManager-1.0.[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # upstream 1.0 - if re.match(r'^.*/NetworkManager-1.1.[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # upstream 1.1 + return 'rhel-7.1' # upstream 1.0 if re.match(r'^.*/NetworkManager-0.9.10.[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # 0.9.10 + return 'rhel-7.1' # 0.9.10 if re.match(r'^.*/NetworkManager-0.9.9.9[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): - return 'master' # 0.9.10-rc + return 'rhel-7.1' # 0.9.10-rc if re.match(r'^.*/NetworkManager-0\.9\.11\..*\.git20141022.e28ee14.el7.x86_64.rpm$', u): - return 'master' # rhel-7.1-rc + return 'rhel-7.1' # rhel-7.1-rc if re.match(r'^.*/NetworkManager-1.0.[0-9]+-[0-9]+\.git20150121\.b4ea599c\.el7.x86_64.rpm$', u): - return 'master' # rhel-7.1-rc + return 'rhel-7.1' # rhel-7.1-rc + if re.match(r'^.*/NetworkManager-1.1.[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u): + return 'master' # upstream 1.1 raise Exception("could not detect the target branch. Try setting as environment variable GIT_TARGETBRANCH%s" % ( ((" (or try setting "+key_name+")") if key_name == 'GIT_TARGETBRANCH' else ''))) |