Review Board 7.1 alpha 0 (dev)

From 3ff1119f7e07ac4707853b0da9a9b07a0789532c 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, 25 insertions(+), 12 deletions(-)

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

index 190e2a53f00b7a44ccb7210388eeee95a56e51ec..0d5650d8334c1a3e5adb5225d54406e2ce97f8fc 100755

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

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

@@ -1811,6 +1811,9 @@ class UpgradeCommand(Command):

         group.add_option("--no-db-upgrade", action="store_false",

                          dest="upgrade_db", default=True,

                          help="don't upgrade the database")

+        group.add_option("--all-sites", action="store_true",

+                         dest="all_sites", default=False,

+                         help="Upgrade all installed sites")

         parser.add_option_group(group)

     def run(self):

@@ -1962,28 +1965,33 @@ 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 command == 'upgrade' and options.all_sites:

+        sitelist = SiteList(options.sitelist)

+        site_paths = sitelist.sites

+        if len(site_paths) == 0:

+            print "No Review Board sites listed in %s" % sitelist.path

+            sys.exit(1)

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

+        site_paths = [args[1]]

+    else:

         parser.print_help()

         sys.exit(1)

-    command = args[0]

-    install_dir = args[1]

-

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

-    return (command, install_dir)

+    return (command, site_paths)

 def main():

     global site

     global ui

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

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

     command = COMMANDS[command_name]

-    site = Site(install_dir, options)

-

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

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

         ui = GtkUI()

@@ -1991,8 +1999,13 @@ def main():

     if not ui:

         ui = ConsoleUI()

-    command.run()

-    ui.run()

+    for install_dir in site_paths:

+        site = Site(install_dir, options)

+

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

+

+        command.run()

+        ui.run()

 if __name__ == "__main__":

-- 

1.8.3.1