Change requirement dependencies for --update option.

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index 2b359d6..0b0fefc 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -16,7 +16,7 @@ REQUIRED_PACKAGES = ["python-pip", "python-webob", "python-bcrypt",
                      "python-formencode", "python-pylons", "python-dev",
                      "python-pastescript", "python-psycopg2", "python-nose",
                      "build-essential", "python-amqplib", "python-anyjson",
-                     "python-mailer", "apache2", "git-core"]
+                     "python-mailer", "apache2", "git"]
 # Packages required for celery integration.
 CELERY_REQUIRED_PACKAGES = ["rabbitmq-server"]
 
@@ -175,16 +175,12 @@ def check_cli_args(args):
     Logic to handle the various cases for the cli args.
     :param args: The args passed on the command line.
     """
+    # Checks for required options during update.
     if not args.rhodecode_config:
         print ("It is necessary to specify the path to RhodeCode "
                "configuration file.")
         sys.exit(1)
-    if not args.rhodecode_admin_pwd:
-        print ("It is necessary to specify the administration password for "
-               "RhodeCode")
-        sys.exit(1)
 
-    # Checks for required options during update.
     if args.update:
         if not args.rhodecode_usr:
             print ("During update it is necessary to specify the RhodeCode"
@@ -199,6 +195,12 @@ def check_cli_args(args):
                    "database name.")
             sys.exit(1)
 
+    else:
+        if not args.rhodecode_admin_pwd:
+            print ("It is necessary to specify the administration "
+                   "password for RhodeCode")
+            sys.exit(1)
+
     if not args.no_celery:
         if (args.rabbitmq_usr == RABBITMQ_DEFAULT_USER or \
               args.rabbitmq_vhost == RABBITMQ_DEFAULT_VHOST):