Merge lp:~frankban/juju-gui/distfile-fixes into lp:juju-gui/experimental

[Francesco Banconi]

Fix broken symbolic links in release tarballs.

Now, when the release is created (make distfile) the symbolic links
are followed.

Another solution could be to create relative links in "make build*".
However, I preferred to dereference the links for two reasons:
- it is simple;
- it allows uncompresing our release also in filesystems not supporting
  symlinks.

https://codereview.appspot.com/6962044/

[Francesco Banconi (frankban)]

Reviewers: mp+140662_code.launchpad.net,

Message:
Please take a look.

Description:
Fix broken symbolic links in release tarballs.

Now, when the release is created (make distfile) the symbolic links
are followed.

Another solution could be to create relative links in "make build*".
However, I preferred to dereference the links for two reasons:
- it is simple;
- it allows uncompresing our release also in filesystems not supporting
   symlinks.

https://code.launchpad.net/~frankban/juju-gui/distfile-fixes/+merge/140662

(do not edit description out of merge proposal)

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

Affected files:
   M Makefile
   A [revision details]

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2012-12-18 22:18:29 +0000
+++ Makefile 2012-12-19 12:09:20 +0000
@@ -399,8 +399,9 @@
   @echo "$(BRANCH_IS_CLEAN)"
  ifdef BRANCH_IS_GOOD
   mkdir -p releases
- tar c --auto-compress --exclude-vcs --exclude releases \
- --transform "s|^|$(RELEASE_NAME)/|" -f $(RELEASE_FILE) *
+ # When creating the tarball, ensure all symbolic links are followed.
+ tar -c --auto-compress --exclude-vcs --exclude releases \
+ --dereference --transform "s|^|$(RELEASE_NAME)/|" -f $(RELEASE_FILE) *
   @echo "Release was created in $(RELEASE_FILE)."
  else
   @echo "**************************************************************"

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>

[Gary Poster (gary)]

Land as is.

Very nice. Didn't know about that option. Thank you.

Gary

https://codereview.appspot.com/6962044/

[Francesco Banconi (frankban)]

Benji, Gary, thanks for the reviews.

https://codereview.appspot.com/6962044/

[Francesco Banconi (frankban)]

*** Submitted:

Fix broken symbolic links in release tarballs.

Now, when the release is created (make distfile) the symbolic links
are followed.

Another solution could be to create relative links in "make build*".
However, I preferred to dereference the links for two reasons:
- it is simple;
- it allows uncompresing our release also in filesystems not supporting
   symlinks.

R=benji, gary.poster
CC=
https://codereview.appspot.com/6962044

https://codereview.appspot.com/6962044/

=== modified file 'Makefile'
--- Makefile	2012-12-18 22:18:29 +0000
+++ Makefile	2012-12-19 13:09:29 +0000
@@ -399,8 +399,9 @@
 	@echo "$(BRANCH_IS_CLEAN)"
 ifdef BRANCH_IS_GOOD
 	mkdir -p releases
-	tar c --auto-compress --exclude-vcs --exclude releases \
-	    --transform "s|^|$(RELEASE_NAME)/|" -f $(RELEASE_FILE) *
+	# When creating the tarball, ensure all symbolic links are followed.
+	tar -c --auto-compress --exclude-vcs --exclude releases \
+	    --dereference --transform "s|^|$(RELEASE_NAME)/|" -f $(RELEASE_FILE) *
 	@echo "Release was created in $(RELEASE_FILE)."
 else
 	@echo "**************************************************************"