Fixes at trac-upgrade and system-upgrade

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index f2e391719cf5df87dcea54cbb893e174251625ae..a309658c8a20e836de384d76e96f4d9f8301fc74 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -121,8 +121,12 @@ if [ ! -e "$STATE" ]; then
 else
   # Resume from the previous state
   STAGE="`cat $STATE`"
-  source $ENV
-  hydra_system_upgrade_$STATE
+
+  # Restore environment
+  if [ -e "$ENV" ]; then
+    source $ENV
+    hydra_system_upgrade_$STATE
+  fi
 fi
 
 # Prepare

diff --git a/share/hydractl/trac-upgrade b/share/hydractl/trac-upgrade
index 06a6a696547f0a7880d0612a9b46f7b9e432be15..31e8f529f94cf5acc087e8a69ca079a596d0cad0 100755 (executable)
--- a/share/hydractl/trac-upgrade
+++ b/share/hydractl/trac-upgrade
@@ -23,6 +23,11 @@ hydra_config_load
 # Parameters
 BASE="/var/sites"
 
+# Check for sites
+if [ ! -d "$BASE" ]; then
+  exit
+fi
+
 # Upgrade
 for instance in `find $BASE -maxdepth 2 -name trac`; do
   (