diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:23:29 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 20:19:06 +0000 |
| commit | 5047e3640e809aa0374f3dce2c825d2b5e6dbc5f (patch) | |
| tree | 793889d852b2e54ee51767ae6717cdc95a0d40a5 | |
| parent | 3df71eb11fbe8a6195564f179186a70b5ee60d6d (diff) | |
Sync release-prep tools from telepathy-glib
| -rw-r--r-- | tools/make-release-mail.py | 13 | ||||
| -rw-r--r-- | tools/telepathy.am | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py index 5c42b47..b03ebd2 100644 --- a/tools/make-release-mail.py +++ b/tools/make-release-mail.py @@ -6,6 +6,15 @@ # to <telepathy@lists.freedesktop.org>. I hope that you enjoy your stay. import sys +import re + +def looks_like_a_header(line, package, version=None): + if version is None: + pattern = "^%s .* \(.*\)$" % package + else: + pattern = "^%s %s \(.*\)$" % (package, version) + + return re.match(pattern, line) is not None def extract_description(package, version, news_path): release_name = [] @@ -15,7 +24,7 @@ def extract_description(package, version, news_path): lines = (line for line in f.readlines()) for line in lines: # Find the 'telepathy-foo 0.1.2' header - if line.startswith("%s %s" % (package, version)): + if looks_like_a_header(line, package, version): break # Skip the ====== line, and the first blank line @@ -27,7 +36,7 @@ def extract_description(package, version, news_path): for line in lines: line = line.rstrip() # If we hit the next version header, we're done - if line.startswith(package): + if looks_like_a_header(line, package): break # Else, if we hit a blank line and we're still reading the release # name, we're done with the release name. diff --git a/tools/telepathy.am b/tools/telepathy.am index 2b6c430..e6defea 100644 --- a/tools/telepathy.am +++ b/tools/telepathy.am @@ -50,7 +50,7 @@ maintainer-prepare-release: $(MAKE) all $(MAKE) distcheck $(MAKE) release-mail - git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@ + cd $(srcdir) && git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@ gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz release-mail: NEWS |