From 9ed5b35c61a4611435a00482be58e1fb24cc6400 Mon Sep 17 00:00:00 2001

From: Stephen Gallagher <sgallagh@redhat.com>

Date: Tue, 4 Jun 2013 15:19:01 -0400

Subject: [PATCH 2/2] Allow upgrading all configured sites at once

---

 reviewboard/cmdline/rbsite.py | 37 ++++++++++++++++++++++---------------

 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/reviewboard/cmdline/rbsite.py b/reviewboard/cmdline/rbsite.py

index 0a7746a166f13a39577b97592d298c5bb509e979..29851928881533b53e37ce19ba61cc3a55bfa09b 100755

--- a/reviewboard/cmdline/rbsite.py

+++ b/reviewboard/cmdline/rbsite.py

@@ -1965,37 +1965,44 @@ def parse_options(args):

     if options.noinput:

         options.force_console = True

-    # We expect at least two args (command and install path)

-    if len(args) < 2 or args[0] not in COMMANDS.keys():

+    command = args[0]

+

+    # Check whether we've been asked to upgrade all installed sites

+    # by 'rb-site upgrade' with no path specified.

+    if len(args) >= 2 and command in COMMANDS:

+        install_dirs = [args[1]]

+    elif len(args) < 2 and command == 'upgrade':

+        sitelist = SiteList(options.sitelist)

+        install_dirs = sitelist.get_sites()

+    else:

         parser.print_help()

         sys.exit(1)

-    command = args[0]

-    install_dir = args[1]

-

     globals()["args"] = args[2:]

-    return (command, install_dir)

+    return (command, install_dirs)

 def main():

     global site

     global ui

-    command_name, install_dir = parse_options(sys.argv[1:])

+    command_name, install_dirs = parse_options(sys.argv[1:])

     command = COMMANDS[command_name]

-    site = Site(install_dir, options)

-    os.putenv('HOME', os.path.join(site.install_dir, "data"))

+    for install_dir in install_dirs:

+        site = Site(install_dir, options)

-    if command.needs_ui and can_use_gtk and not options.force_console:

-        ui = GtkUI()

+        os.putenv('HOME', os.path.join(site.install_dir, "data"))

-    if not ui:

-        ui = ConsoleUI()

+        if command.needs_ui and can_use_gtk and not options.force_console:

+            ui = GtkUI()

-    command.run()

-    ui.run()

+        if not ui:

+            ui = ConsoleUI()

+

+        command.run()

+        ui.run()

 if __name__ == "__main__":

-- 

1.8.2.1