Merge pull request #21038 from ggovi/condcore-utilities-cond2xml-fix1…

…-94X

Fix for conddb dump command

CondCore/Utilities/python/cond2xml.py

@@ -143,7 +143,7 @@ def prepPayload2xml(self, payloadType):
         	 codeFile.write(code)
     	 	 codeFile.close()
 
-    	cmd = "source /afs/cern.ch/cms/cmsset_default.sh;"
+    	cmd = "source /cvmfs/cms.cern.ch/cmsset_default.sh;"
     	cmd += "(cd %s ; scram b 2>&1 >build.log)" %tmpDir
         pipe = subprocess.Popen( cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
         out, err = pipe.communicate()
@@ -153,6 +153,7 @@ def prepPayload2xml(self, payloadType):
         logging.info("Building done in %s sec., return code from build: %s" %(buildTime,ret) )
 
 	if (ret != 0):
+           logging.error("Local build for xml dump failed.")
            return None
 
         libFile = os.path.join(libDir,pluginName + '.so')
@@ -175,11 +176,12 @@ def payload2xml(self, session, payloadHash, destFile):
         convFuncName = sanitize(plType)+'2xml'
         xmlConverter = self.prepPayload2xml(plType)
 
-        obj = xmlConverter()
-        resultXML = obj.write( str(data) )
-        if destFile is None:
-           print resultXML    
-        else:
-           with open(destFile, 'w') as outFile:
-              outFile.write(resultXML)
-              outFile.close()
+        if xmlConverter is not None:
+           obj = xmlConverter()
+           resultXML = obj.write( str(data) )
+           if destFile is None:
+              print resultXML    
+           else:
+              with open(destFile, 'w') as outFile:
+                 outFile.write(resultXML)
+                 outFile.close()