Review Board 7.1 alpha 0 (dev)

From 41538ed97a8c59f110aead71c185e0140a9b605a Mon Sep 17 00:00:00 2001

From: Stephen Gallagher <sgallagh@redhat.com>

Date: Tue, 4 Jun 2013 14:47:38 -0400

Subject: [PATCH 1/2] Store installation paths to sitelist file during 'rb-site

 install'

---

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

 1 file changed, 59 insertions(+), 2 deletions(-)

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

index b3b4af61731abba99273b8eae566e1de7efd193f..190e2a53f00b7a44ccb7210388eeee95a56e51ec 100755

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

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

@@ -18,6 +18,8 @@ from reviewboard import get_version_string

 DOCS_BASE = "http://www.reviewboard.org/docs/manual/dev/"

+SITELIST_FILE_UNIX = "/etc/reviewboard/sites"

+

 # See if GTK is a possibility.

 try:

@@ -630,6 +632,43 @@ class Site(object):

         fp.close()

+class SiteList(object):

+    """Maintains the list of sites installed on the system."""

+    def __init__(self, path):

+        self.path = path

+

+        # Read the list in as a unique set.

+        # This way, we can easily eliminate duplicates.

+        self.sites = set()

+

+        if os.path.exists(self.path):

+            f = open(self.path, 'r')

+

+            for line in f:

+                site = line.strip()

+

+                # Verify that this path exists on the system

+                # And add it to the dictionary.

+                if os.path.exists(site):

+                    self.sites.add(site)

+

+            f.close()

+

+    def add_site(self, site_path):

+        self.sites.add(site_path)

+

+        # Write all of the sites back to the file.

+        # Sort keys to ensure consistent order.

+        ordered_sites = list(self.sites)

+        ordered_sites.sort()

+

+        f = open(self.path, "w")

+        for site in ordered_sites:

+            f.write("%s\n" % site)

+

+        f.close()

+

+

 class UIToolkit(object):

     """

     An abstract class that forms the basis for all UI interaction.

@@ -1321,12 +1360,13 @@ class InstallCommand(Command):

     needs_ui = True

     def add_options(self, parser):

-        isWin = (platform.system() == "Windows")

+        is_windows = platform.system() == "Windows"

         group = OptionGroup(parser, "'install' command",

                             self.__doc__.strip())

         group.add_option("--copy-media", action="store_true",

-                         dest="copy_media", default=isWin,

+                         dest="copy_media",

+                         default=is_windows,

                          help="copy media files instead of symlinking")

         group.add_option("--noinput", action="store_true", default=False,

@@ -1372,6 +1412,13 @@ class InstallCommand(Command):

         group.add_option("--admin-email",

                          help="the site administrator's e-mail address")

+        # UNIX-specific arguments

+        if not is_windows:

+            group.add_option("--sitelist",

+                             default=SITELIST_FILE_UNIX,

+                             help="the path to a file storing a list of "

+                                  "installed sites")

+

         parser.add_option_group(group)

     def run(self):

@@ -1401,6 +1448,7 @@ class InstallCommand(Command):

             self.ask_web_server_type()

             self.ask_python_loader()

             self.ask_admin_user()

+            # Do not ask for sitelist file, it should not be common.

         self.show_install_status()

         self.show_finished()

@@ -1742,6 +1790,15 @@ class InstallCommand(Command):

         siteconfig.set("site_admin_email", site.admin_email)

         siteconfig.save()

+        if platform.system() != 'Windows':

+            abs_sitelist = os.path.abspath(site.sitelist)

+

+            # Add the site to the sitelist file.

+            print("Saving site %s to the sitelist %s\n" % (

+                  site.install_dir, abs_sitelist))

+            sitelist = SiteList(abs_sitelist)

+            sitelist.add_site(site.install_dir)

+

 class UpgradeCommand(Command):

     """

-- 

1.8.3.1