aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2022-03-20 09:03:36 -0300
committerDavid Bremner <david@tethera.net>2022-06-17 08:40:19 -0300
commit803ac83c467e440a64fbde4628bee8673b4db01d (patch)
tree04bf5b76983ad43ae18cb974ddf952f0833fbd2f
parent9695e4c38de562249cbae02bd896d6bb46ba879f (diff)
nmbug: promote to user tool "notmuch-git"
Initially just a rename, and drop the --version argument that clashes with the global notmuch --version argument.
-rw-r--r--Makefile.local7
-rw-r--r--[-rwxr-xr-x]notmuch-git.py (renamed from devel/nmbug/nmbug)6
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.local b/Makefile.local
index d8bbf3e1..d2e0c7a8 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,7 +1,7 @@
# -*- makefile-gmake -*-
.PHONY: all
-all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings
+all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings notmuch-git
ifeq ($(MAKECMDGOALS),)
ifeq ($(shell cat .first-build-message 2>/dev/null),)
@NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
@@ -45,6 +45,11 @@ $(SHA256_FILE): $(TAR_FILE)
$(DETACHED_SIG_FILE): $(TAR_FILE)
gpg --armor --detach-sign $^
+CLEAN := $(CLEAN) notmuch-git
+notmuch-git: notmuch-git.py
+ cp $< $@
+ chmod ugo+x $@
+
.PHONY: dist
dist: $(TAR_FILE)
diff --git a/devel/nmbug/nmbug b/notmuch-git.py
index 043c1863..04cdae0f 100755..100644
--- a/devel/nmbug/nmbug
+++ b/notmuch-git.py
@@ -50,9 +50,6 @@ except ImportError: # Python 2
from urllib import quote as _quote
from urllib import unquote as _unquote
-
-__version__ = '0.3'
-
_LOG = _logging.getLogger('nmbug')
_LOG.setLevel(_logging.WARNING)
_LOG.addHandler(_logging.StreamHandler())
@@ -719,9 +716,6 @@ if __name__ == '__main__':
description=__doc__.strip(),
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument(
- '-v', '--version', action='version',
- version='%(prog)s {}'.format(__version__))
- parser.add_argument(
'-l', '--log-level',
choices=['critical', 'error', 'warning', 'info', 'debug'],
help='Log verbosity. Defaults to {!r}.'.format(