Merge pull request #179 from SpiderOak/management_console_2.0.5

add version to folder name when building upgrade package
SpiderOak · Oct 21, 2014 · bf1d96d · bf1d96d
2 parents 2361c7a + 7f264fd
commit bf1d96d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/deploy/make_tarball.sh b/deploy/make_tarball.sh
@@ -22,7 +22,7 @@ management_files=$3
 echo "Building OpenManage software suite from $source_dir"
 
 deploy_dir=$source_dir/deploy           # source_dir/deploy
-buildit_dir=$deploy_dir/openmanage      # source_dir/deploy/openmanage
+buildit_dir=$deploy_dir/openmanage-$version      # source_dir/deploy/openmanage
 
 # The following script gets packages, like from pip, and puts them in $source_dir/upgrade.
 echo

diff --git a/django/omva/settings.py b/django/omva/settings.py
@@ -188,3 +188,8 @@
         'handlers': ['console']
     }
 }
+
+try:
+    from dev_settings import *
+except Exception:
+    pass