Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-01-31 22:22:17 +0100
committerMichal Kubecek <mkubecek@suse.cz>2019-01-31 22:22:17 +0100
commita8fc1440eeb6945492460f4638c9fb8754851670 (patch)
treea57d7481c42c7327dd32870ebe09a4a8649eb1a2
parente5dd35e7835b5ae59f49e90d049638079609de6b (diff)
parent90691bf0ef84e61f7d7c6b9f49a2571677579700 (diff)
Merge branch 'scripts'
-rwxr-xr-xscripts/bugzilla-cli2
-rw-r--r--scripts/bugzilla/_cli.py2
-rwxr-xr-xscripts/log21
-rwxr-xr-xscripts/python/suse_git/header.py2
4 files changed, 4 insertions, 3 deletions
diff --git a/scripts/bugzilla-cli b/scripts/bugzilla-cli
index c06c04b6dc..c1eca50a0d 100755
--- a/scripts/bugzilla-cli
+++ b/scripts/bugzilla-cli
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
# This is a small wrapper script to simplify running the 'bugzilla'
# cli tool from a git checkout
diff --git a/scripts/bugzilla/_cli.py b/scripts/bugzilla/_cli.py
index a0a6d8302b..d314d38e9c 100644
--- a/scripts/bugzilla/_cli.py
+++ b/scripts/bugzilla/_cli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# bugzilla - a commandline frontend for the python bugzilla module
#
diff --git a/scripts/log2 b/scripts/log2
index 8e159d72ea..25ad680b4e 100755
--- a/scripts/log2
+++ b/scripts/log2
@@ -402,6 +402,7 @@ deleted=($(git diff --name-only --diff-filter=D HEAD))
scripts/check-patch-dirs "${added[@]}" "${modified[@]}" || exit 1
if only_patches; then
+ git add -u
"$_libdir"/git-pre-commit || exit
commit_single_patches || exit
else
diff --git a/scripts/python/suse_git/header.py b/scripts/python/suse_git/header.py
index e820bb56fd..262dfc8743 100755
--- a/scripts/python/suse_git/header.py
+++ b/scripts/python/suse_git/header.py
@@ -167,7 +167,7 @@ tag_map = {
'accepted' : [
{
'name' : 'SUSE',
- 'match' : '(bsc|boo|bnc|fate)#\d+',
+ 'match' : '((bsc|boo|bnc|fate)#\d+|jsc#\w+-\d+)',
},
{
'match' : '\S+',