Changeset 32904

Timestamp:

Dec 8, 2011, 3:48:39 PM (15 years ago)

Author:

Serge CHASTEL

Message:

Improved verifications

Location:

trunk/ippdor/deployment

Files:

• Deployment.py (modified) (2 diffs)
• deploy.py (modified) (2 diffs)

trunk/ippdor/deployment/Deployment.py

@@ -96 +96 @@
         """
         Check different elements
-        TODO: add checks for IppSite definition
         """
         Deployment.logger.info('Checking Condor-IPP Softwares Configuration')
+        # Configuration
+        from IppSite import IppSite, Gpc1
+        Deployment.logger.info('Checking definition of IppSite.SVN_SOURCE_URL: %s' 
+                               % IppSite.SVN_SOURCE_URL)
+        Deployment.logger.info('Checking definition of IppSite.TARGET_DIRECTORY: %s' 
+                               % IppSite.TARGET_DIRECTORY)
+        Deployment.logger.info('Checking definition of IppSite.TARGET_BINARY_DIRECTORY: %s' 
+                               % IppSite.TARGET_BINARY_DIRECTORY)
+        Deployment.logger.info('Checking definition of IppSite.LOCAL_TMP_DIR: %s' 
+                               % IppSite.LOCAL_TMP_DIR)
+        Deployment.logger.info('Checking definition of IppSite.NFS_TMP_DIR: %s' 
+                               % IppSite.NFS_TMP_DIR)
+        Deployment.logger.info('Checking definition of IppSite.IPP_BIN_PATH: %s' 
+                               % IppSite.IPP_BIN_PATH)
+        Deployment.logger.info('Checking definition of Gpc1.HOST: %s' 
+                               % Gpc1.HOST)
+        Deployment.logger.info('Checking definition of Gpc1.NAME: %s' 
+                               % Gpc1.NAME)
+        Deployment.logger.info('Checking definition of Gpc1.USER: %s' 
+                               % Gpc1.USER)
+        Deployment.logger.info('Checking definition of Gpc1.PASSWORD: %s' 
+                               % Gpc1.PASSWORD)
         # self.target_directory
         Deployment.logger.info('... Checking write permission to %s' % self.target_directory)
@@ -165 +186 @@
                     os.makedirs('%s/%s' % (self.target_directory,
                                            path_elements[0]))
-                except OSError, e:
-                    Deployment.logger.warn(e)
+                except OSError, exc:
+                    Deployment.logger.warn(exc)
                     Deployment.logger.info('Ignored')
         for filename in Deployment.CLASSES_FILENAMES:

trunk/ippdor/deployment/deploy.py

@@ -12 +12 @@
 
 if __name__ == '__main__':
+    if os.getenv('PYTHONPATH') is not None:
+        print 'Error: Unset PYTHONPATH environment variable to run this program'
+        sys.exit(1)
     USAGE = """usage: %prog [options] <ipp site definition file>
 
@@ -78 +81 @@
     LOGGER.info('Cleaning temporary site definitions')
     os.remove('.tmp_site/IppSite.py')
-    os.remove('.tmp_site/IppSite.pyc')
+    try:
+        os.remove('.tmp_site/IppSite.pyc')
+    except OSError:
+        pass # Ignore if not compiled
     os.remove('.tmp_site/__init__.py')
     os.rmdir('.tmp_site')