Merge ~bjornt/maas:release-prepare-fail-if-no-change into maas:master

Proposed by Björn Tillenius
Status: Merged
Approved by: Björn Tillenius
Approved revision: d6a37d3691ade476bcc82e0addb6550523b399ff
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~bjornt/maas:release-prepare-fail-if-no-change
Merge into: maas:master
Diff against target: 25 lines (+7/-0)
1 file modified
utilities/release-prepare (+7/-0)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Needs Fixing
Review via email: mp+409935@code.launchpad.net

Commit message

Prevent release-prepare from committing if the version didn't change.

The main reason for this is to prevent it being run by mistake and add
unneeded entries to debian/changelog.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b release-prepare-fail-if-no-change lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11234/console
COMMIT: d6a37d3691ade476bcc82e0addb6550523b399ff

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/utilities/release-prepare b/utilities/release-prepare
2index 8b5917b..13a1517 100755
3--- a/utilities/release-prepare
4+++ b/utilities/release-prepare
5@@ -29,6 +29,10 @@ git_show_commit() {
6 git show HEAD
7 }
8
9+version_changed() {
10+ ! git diff --exit-code setup.cfg
11+}
12+
13 deb_version() {
14 local version
15 version="$(echo "$1" | sed 's/a/~alpha/; tend; s/b/~beta/; tend; s/rc/~rc/; :end')"
16@@ -91,6 +95,9 @@ if ! git_tree_clean; then
17 fi
18
19 replace_setup_version "$version"
20+if ! version_changed; then
21+ exit_error "The version is already set to $1"
22+fi
23 add_debian_changelog "$version"
24 commit "$version"
25 git_show_commit

Subscribers

People subscribed via source and target branches