Merge branch 'hotfix-0.5.3' into develop

Conflicts:
	image_creator/version.py
	version

diff --git a/ci/autopkg_debian.sh b/ci/autopkg_debian.sh
index 70eecdd..62e678e 100755 (executable)
--- a/ci/autopkg_debian.sh
+++ b/ci/autopkg_debian.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 set -e
 
-PACKAGES_DIR=$1
+PACKAGES_DIR="$1"
 
 shift
 
-TEMP_DIR=$(mktemp -d /tmp/devflow_autopkg_XXXXXXX)
+TEMP_DIR="$(mktemp -d /tmp/devflow_autopkg_XXXXXXX)"
 
 # Create the packages
-devflow-autopkg snapshot -b $TEMP_DIR $@
+devflow-autopkg snapshot -b "$TEMP_DIR" "$@"
 
 # MOVE the packages
-mkdir -p $PACKAGES_DIR
-mv -n $TEMP_DIR/* $PACKAGES_DIR
+mkdir -p "$PACKAGES_DIR"
+mv -n "$TEMP_DIR"/* "$PACKAGES_DIR"
 
 echo "Moved packages to: $(pwd)/$PACKAGES_DIR"
 

diff --git a/ci/make_docs.sh b/ci/make_docs.sh
index 61a53d9..f9ed0e1 100755 (executable)
--- a/ci/make_docs.sh
+++ b/ci/make_docs.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
-DOCS_DIR=$1
+DOCS_DIR="$1"
 
 cd docs
 make html
 cd -
 
-mkdir -p $DOCS_DIR
-mv -n docs/_build/html/* $DOCS_DIR
+mkdir -p "$DOCS_DIR"
+mv -n docs/_build/html/* "$DOCS_DIR"
 
 echo "Moved docs to to: $(pwd)/$DOCS_DIR"

diff --git a/image_creator/version.py b/image_creator/version.py
index 351ff30..8d88873 100644 (file)
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
 
-__version__ = "0.5.3"
+__version__ = "0.5.3next"
 __version_vcs_info__ = {
-    'branch': 'hotfix-0.5.3',
-    'revid': 'dc0ecb2',
+    'branch': 'develop',
+    'revid': '2a62304',
     'revno': 402}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"

diff --git a/version b/version
index be14282..3f4f53f 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.5.3
+0.5.3next