Changeset 4586

Timestamp:

10/12/08 09:46:33 (11 years ago)

Author:

pjkersha

Message:

Removed refs to Twisted in ndg-security-install. Twisted is no longer needed and even it needs to be re-instated it now supports egg based install.

File:

• TI12-security/trunk/python/ndg-security-install.py (modified) (7 diffs)

TI12-security/trunk/python/ndg-security-install.py

@@ -1 +1 @@
 #!/usr/bin/env python
-"""Install NDG Server package with M2Crypto build settings and to include
-Twisted 
+"""Install NDG Server package with M2Crypto build settings
 
 NERC Data Grid Project
@@ -39 +38 @@
     @type dependencyLink: string
     
-    @cvar defaultTwistedURI: default location for Twisted download
-    @type param: string 
-    
     @cvar configDir: default location for configuration directory "conf"
     @type configDir: string'''
     
     dependencyLink = "http://ndg.nerc.ac.uk/dist/"  
-    defaultTwistedURI = \
-'http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/TwistedSumo-2006-02-12.tar.bz2'
     configDir = os.path.join("/etc", "ndg", "security", "conf")
     
@@ -91 +85 @@
                           default='/usr/local/ssl',
                           help="Path to openssl for M2Crypto to link with")
-        
-        parser.add_option("-n",
-                          "--no-twisted",
-                          dest="noTwisted",
-                          action="store_true",
-                          default=False,
-                          help=\
-"""Skip Twisted install.  This option applies to the \"all\" and \"server\"
-package options only.  Twisted is not needed for the client.""")
-        
-        parser.add_option("-t",
-                          "--twisted-uri",
-                          dest="twistedURI",
-                          default=self.__class__.defaultTwistedURI,
-                          help=\
-"""Provide an alternative location for Twisted download.  A .tar.bz type file
-is expected.  The default is \"%s\"""" % self.__class__.defaultTwistedURI)
         
         parser.add_option("-f",
@@ -167 +144 @@
             args += ["ndg_security_server"]
             main(args)
-            self.installTwisted()
             
             # Config dir is part of server package only
@@ -176 +152 @@
             args += ["ndg_security_test"]
             main(args)
-            self.installTwisted()
            
         elif self.opt.installAll:
@@ -188 +163 @@
                          "ndg_security_client"] 
             main(args)
-            self.installTwisted()
             
             # Config dir is part of server package
@@ -247 +221 @@
                                                 '.pydistutils.cfg')
             configParser.write(open(distutilsCfgFilePath, 'w'))
-    
-    
-    def installTwisted(self):
-        '''Download and install twisted manually as it is not egg compatible
-        '''
-        
-        if self.opt.noTwisted:
-            return
-        
-        log.info("Installing Twisted: %s ..." % self.opt.twistedURI)
-        
-        # Install Twisted sumo
-        try:
-            twistedTarBz = os.path.basename(self.opt.twistedURI)    
-            urllib.urlretrieve(self.opt.twistedURI, twistedTarBz)
-            
-        except IOError, (errMsg, e):
-            raise SecurityInstallError, \
-                'Error retrieving Twisted from "%s": %s' % \
-                                                (self.opt.twistedTarURI, e[1])
-        except Exception, e:
-            raise SecurityInstallError, \
-                'Error retrieving Twisted from "%s": %s' % \
-                                                (self.opt.twistedTarURI, e)
-
-        import tarfile
-       
-        twistedTar = tarfile.open(twistedTarBz, 'r:bz2')
-        for tarInfo in twistedTar:
-            twistedTar.extract(tarInfo)
-       
-        try:
-            twistedDir=os.path.splitext(os.path.splitext(twistedTarBz)[0])[0]
-        except Exception:
-            raise SecurityInstallError, \
-            'Error getting Twisted dir path from tar.bz file name: "%s"' % \
-                twistedTarBz
-        
-        os.chdir(twistedDir)
-        try: 
-            retCode = call([os.path.join(sys.prefix, 'bin', 'python'), 
-                            'setup.py', 
-                            'install'])
-        except OSError, e:
-            raise SecurityInstallError, \
-                        "Error calling setup install for Twisted: " + str(e)
-        
-        if retCode != 0:
-            raise SecurityInstallError, "Twisted setup install returned %d" %\
-                                        retCode
-        
-        os.chdir('..')