Merge lp:~abentley/juju-release-tools/unsigned-devel into lp:juju-release-tools

[Aaron Bentley]

Use json extension for devel mirrors.

This branch forces the extension to '.json' for devel tools.

It is hoped that this will allow the devel streams to be used without further configuration.

[Curtis Hovey (sinzui)]

thank you.

review: Approve (code)

=== modified file 'assemble-streams.bash'
--- assemble-streams.bash	2016-01-21 16:09:30 +0000
+++ assemble-streams.bash	2016-02-01 18:29:04 +0000
@@ -649,7 +649,9 @@
         signed_file=$(echo "$meta_file" | sed -e $pattern)
         echo "Creating $signed_file"
         echo "gpg $gpg_options --clearsign $key_option > $signed_file"
-        sed -e $pattern $meta_file |
+        sed -e $pattern \
+            -e 's/juju:devel:tools.sjson/juju:devel:tools.json/' \
+            $meta_file |
             gpg $gpg_options --clearsign $key_option > $signed_file
         echo "gpg $gpg_options --detach-sign $key_option > $meta_file.gpg"
         cat $meta_file |
@@ -668,7 +670,9 @@
         signed_file=$(echo "$meta_file" | sed -e $pattern)
         echo "Creating $signed_file"
         #echo "gpg $gpg_options --clearsign $key_option > $signed_file"
-        sed -e $pattern $meta_file |
+        sed -e $pattern \
+            -e 's/juju:devel:tools.sjson/juju:devel:tools.json/' \
+            $meta_file |
             gpg $gpg_options --clearsign $key_option > $signed_file
         #echo "gpg $gpg_options --detach-sign $key_option > $meta_file.gpg"
         cat $meta_file |