removed unused argument for package uploader

ella · May 23, 2011 · e893082 · e893082
1 parent fbcf364
commit e893082
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/citools/fabfile.py b/citools/fabfile.py
@@ -179,7 +179,7 @@ def getlistpackageslocal(dpkgl_file):
             result[row[0]] = [row[0], row[1]]
     return result
 
-def install_production_packages(clean_machine, production_machine, spectator_password=''):
+def install_production_packages(clean_machine, production_machine):
     """
     This function get dpkg -l from url from production and install it including versions
     Has two required arguments the clean machine for installing production packages and production machine for comparation packages
@@ -208,7 +208,7 @@ def install_production_packages(clean_machine, production_machine, spectator_pas
 
     run("apt-get update")
 
-    dpkgl_file = urllib.urlopen('http://spectator:%s@cml.tunel.chservices.cz/cgi-bin/dpkg.pl?host=%s' % (spectator_password, production_machine))
+    dpkgl_file = urllib.urlopen('http://cml.tunel.chservices.cz/cgi-bin/dpkg.pl?host=%s' % (production_machine,))
     PACKAGES_LIST = getlistpackages(dpkgl_file)
 
     client = paramiko.SSHClient()

diff --git a/citools/pavement.py b/citools/pavement.py
@@ -220,17 +220,15 @@ def ping_buildmaster():
 @task
 @cmdopts([
     ('production-machine=', 'p', 'Production machine'),
-    ('clean-machine=', 'c', 'Clean machine'),
-    ('spectator-password=', 's', 'Spectator password')
+    ('clean-machine=', 'c', 'Clean machine')
 ])
 def install_production_packages(options):
     production_machine = getattr(options, "production_machine")
     clean_machine = getattr(options, "clean_machine")
-    spectator_password = getattr(options, "spectator_password", '')
     # import your fabfile
     fabfile = import_fabfile()
     # invoke fabric task
-    args = (clean_machine, production_machine, spectator_password)
+    args = (clean_machine, production_machine)
     options.packages_list = fab(clean_machine, 
 				fabfile['install_production_packages'], 
 				resolve,