Update for travis

.travis.yml

@@ -28,11 +28,10 @@ script:
   - lsb_release -a
   - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
-  - sudo export wo_branch="$TRAVIS_BRANCH"
   - sed -i 's/# "nose"/"nose"/g' setup.py
   - sed -i 's/# "coverage"/"coverage"/g' setup.py
   - sed -i 's/# "Sphinx >= 1.0"/"Sphinx >= 1.0"/g' setup.py
-  - sudo bash install --travis
+  - sudo bash install --travis -b "$TRAVIS_BRANCH"
   - sudo wo --help && sudo wo stack install && sudo wo stack install --proftpd
   - sudo wo site create html.net --html && sudo wo site create php.com --php && sudo wo site create mysql.com --mysql && sudo wo site create proxy.com --proxy=127.0.0.1:3000
   - sudo wo site create wp1.com --wp && sudo wo site create wpsc1.net --wpsc && sudo wo site create wpfc1.com --wpfc
@@ -60,6 +59,7 @@ script:
   - sudo wo stack upgrade --composer --force
   - sudo wo stack upgrade --dashboard --force
   - sudo wo update --travis
+  - sudo wo update --force
   - sudo wo stack status
   - sudo tar -I pigz  -cf wordops.tar.gz /var/log/wo
   - curl --progress-bar --upload-file wordops.tar.gz https://transfer.vtbox.net/$(basename "wordops.tar.gz") && echo "" | sudo tee -a $HOME/.transfer.log && echo ""

wo/cli/plugins/update.py

@@ -39,10 +39,7 @@ class WOUpdateController(CementBaseController):
         pargs = self.app.pargs
         filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S")
 
-        if pargs.travis:
-            wo_branch = "updating-configuration"
-            install_args = "--travis --force "
-        elif pargs.beta:
+        if pargs.beta:
             wo_branch = "beta"
             install_args = ""
         else:
@@ -59,14 +56,23 @@ class WOUpdateController(CementBaseController):
                                     "/var/lib/wo/tmp/{0}".format(filename),
                                     "update script"]])
 
-        try:
-            Log.info(self, "updating WordOps, please wait...")
-            os.system("/bin/bash /var/lib/wo/tmp/{0} "
-                      "-b {1} {2}".format(filename,
-                                          wo_branch, install_args))
-        except OSError as e:
-            Log.debug(self, str(e))
-            Log.error(self, "WordOps update failed !")
+        if pargs.travis:
+            try:
+                Log.info(self, "updating WordOps, please wait...")
+                os.system("/bin/bash install --travis "
+                          "-b $TRAVIS_BRANCH --force")
+            except OSError as e:
+                Log.debug(self, str(e))
+                Log.error(self, "WordOps update failed !")
+        else:
+            try:
+                Log.info(self, "updating WordOps, please wait...")
+                os.system("/bin/bash /var/lib/wo/tmp/{0} "
+                          "-b {1} {2}".format(filename,
+                                              wo_branch, install_args))
+            except OSError as e:
+                Log.debug(self, str(e))
+                Log.error(self, "WordOps update failed !")
 
 
 def load(app):