Run trac-upgrade during system-upgrade

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index b161a118487b8dd1864753603ede2ae289692154..fdfaceb9cab80b4e7fa59d7bcdd0b847691cbf1e 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -147,6 +147,7 @@ if [ "$STAGE" == "custom" ]; then
     fi
   fi
 
+  hydractl trac-upgrade
   hydra_system_upgrade_stage puppet
 fi
 

diff --git a/share/hydractl/trac-upgrade b/share/hydractl/trac-upgrade
index 89c1e3dc1513574537f068ccfa2111199f40a25e..06a6a696547f0a7880d0612a9b46f7b9e432be15 100755 (executable)
--- a/share/hydractl/trac-upgrade
+++ b/share/hydractl/trac-upgrade
@@ -26,6 +26,7 @@ BASE="/var/sites"
 # Upgrade
 for instance in `find $BASE -maxdepth 2 -name trac`; do
   (
+    echo "Upgrading trac instance $instance..."
     cd $instance
     trac-admin . upgrade
     trac-admin . wiki upgrade