Merge lp:~frankban/juju-gui/bug-1102633-make-distfile into lp:juju-gui/experimental

[Francesco Banconi]

Allow creating non-FINAL release tarballs.

In the charm, when juju-gui-source is a branch,
a release tarball is created from the checkout
running "NO_BZR=1 make distfile".
The "distfile" target was included in the
released/unreleased check by our Makefile.
This means that trying to deploy the charm
from a branch whose CHANGES.yaml does not
include "unreleased:" always fails with
the error reported by therve:
"non-FINAL releases must have a most-recent
version number of unreleased in CHANGES.yaml".
This branch removes that check from the distfile
target: I think we should protect "dist", but
I don't see, given the problems described above,
a valid reason to continue preventing users
to create non-FINAL tarballs, even if the
branch is a final release.

https://codereview.appspot.com/7189043/

[Francesco Banconi (frankban)]

Reviewers: mp+144245_code.launchpad.net,

Message:
Please take a look.

Description:
Allow creating non-FINAL release tarballs.

In the charm, when juju-gui-source is a branch,
a release tarball is created from the checkout
running "NO_BZR=1 make distfile".
The "distfile" target was included in the
released/unreleased check by our Makefile.
This means that trying to deploy the charm
from a branch whose CHANGES.yaml does not
include "unreleased:" always fails with
the error reported by therve:
"non-FINAL releases must have a most-recent
version number of unreleased in CHANGES.yaml".
This branch removes that check from the distfile
target: I think we should protect "dist", but
I don't see, given the problems described above,
a valid reason to continue preventing users
to create non-FINAL tarballs, even if the
branch is a final release.

https://code.launchpad.net/~frankban/juju-gui/bug-1102633-make-distfile/+merge/144245

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7189043/

Affected files:
   M Makefile
   A [revision details]

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2013-01-18 18:59:06 +0000
+++ Makefile 2013-01-22 08:33:50 +0000
@@ -55,7 +55,7 @@
  ULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 1 |
sed 's/[ :-]//g')
  PENULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 2 | tail -n 1
\
      | sed 's/[ :-]//g')
-RELEASE_TARGETS=dist distfile
+RELEASE_TARGETS=dist
  # If the user specified (via setting an environment variable on the command
  # line) that this is a final (non-development) release, set the version
number
  # and series appropriately.

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision:
<email address hidden>

[Nicola Larosa (teknico)]

Land as is.

This looks like a reasonable fix to the mismatch.

https://codereview.appspot.com/7189043/

[Brad Crittenden (bac)]

Thank you. Land as is.

https://codereview.appspot.com/7189043/

[Francesco Banconi (frankban)]

*** Submitted:

Allow creating non-FINAL release tarballs.

In the charm, when juju-gui-source is a branch,
a release tarball is created from the checkout
running "NO_BZR=1 make distfile".
The "distfile" target was included in the
released/unreleased check by our Makefile.
This means that trying to deploy the charm
from a branch whose CHANGES.yaml does not
include "unreleased:" always fails with
the error reported by therve:
"non-FINAL releases must have a most-recent
version number of unreleased in CHANGES.yaml".
This branch removes that check from the distfile
target: I think we should protect "dist", but
I don't see, given the problems described above,
a valid reason to continue preventing users
to create non-FINAL tarballs, even if the
branch is a final release.

R=teknico, bac
CC=
https://codereview.appspot.com/7189043

https://codereview.appspot.com/7189043/

=== modified file 'Makefile'
--- Makefile	2013-01-18 18:59:06 +0000
+++ Makefile	2013-01-22 09:09:21 +0000
@@ -55,7 +55,7 @@
 ULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 1 | sed 's/[ :-]//g')
 PENULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 2 | tail -n 1 \
     | sed 's/[ :-]//g')
-RELEASE_TARGETS=dist distfile
+RELEASE_TARGETS=dist
 # If the user specified (via setting an environment variable on the command
 # line) that this is a final (non-development) release, set the version number
 # and series appropriately.