1. photon
  2. Commit 7acb019e7f39a5ddf26ee950d956d287033f16d6
Browse code

Cleaning up and adding more exceptions

dthaluru authored on 2015/06/16 03:25:36
Showing 2 changed files
support/package-builder/SpecData.py
History View file @ 7acb019
... ... 
@@ -52,90 +52,50 @@ class SerializableSpecObjectsUtils(object):
52 52 
                 self.getListSpecFiles(listSpecFiles,dirEntryPath)
53 53
54 54 
     def getBuildRequiresForPackage(self, package):
55 
-        specName=""
56 
-        if self.mapPackageToSpec.has_key(package):
57 
-            specName=self.mapPackageToSpec[package]
58 
-        if self.mapSerializableSpecObjects.has_key(specName):
59 
-            return self.mapSerializableSpecObjects[specName].buildRequirePackages
60 
-        return None
61 
-
55 
+        specName=self.getSpecName(package)
56 
+        return self.mapSerializableSpecObjects[specName].buildRequirePackages
57 
+
62 58 
     def getRequiresAllForPackage(self, package):
63 
-        specName=""
64 
-        if self.mapPackageToSpec.has_key(package):
65 
-            specName=self.mapPackageToSpec[package]
66 
-        if self.mapSerializableSpecObjects.has_key(specName):
67 
-            return self.mapSerializableSpecObjects[specName].installRequiresAllPackages
68 
-        return None
69 
-
59 
+        specName=self.getSpecName(package)
60 
+        return self.mapSerializableSpecObjects[specName].installRequiresAllPackages
61 
+
70 62 
     def getRequiresForPackage(self, package):
71 
-        specName=""
72 
-        if self.mapPackageToSpec.has_key(package):
73 
-            specName=self.mapPackageToSpec[package]
74 
-        if self.mapSerializableSpecObjects.has_key(specName):
75 
-            if self.mapSerializableSpecObjects[specName].installRequiresPackages.has_key(package):
76 
-                return self.mapSerializableSpecObjects[specName].installRequiresPackages[package]
63 
+        specName=self.getSpecName(package)
64 
+        if self.mapSerializableSpecObjects[specName].installRequiresPackages.has_key(package):
65 
+            return self.mapSerializableSpecObjects[specName].installRequiresPackages[package]
77 66 
         return None
78 67
79 68 
     def getRelease(self, package):
80 
-        specName=""
81 
-        if self.mapPackageToSpec.has_key(package):
82 
-            specName=self.mapPackageToSpec[package]
83 
-        if self.mapSerializableSpecObjects.has_key(specName):
84 
-            return self.mapSerializableSpecObjects[specName].release
85 
-        return None
86 
-
69 
+        specName=self.getSpecName(package)
70 
+        return self.mapSerializableSpecObjects[specName].release
71 
+
87 72 
     def getVersion(self, package):
88 
-        specName=""
89 
-        if self.mapPackageToSpec.has_key(package):
90 
-            specName=self.mapPackageToSpec[package]
91 
-        if self.mapSerializableSpecObjects.has_key(specName):
92 
-            return self.mapSerializableSpecObjects[specName].version
93 
-        return None
94 
-
73 
+        specName=self.getSpecName(package)
74 
+        return self.mapSerializableSpecObjects[specName].version
75 
+
95 76 
     def getSpecFile(self, package):
96 
-        specName=""
97 
-        if self.mapPackageToSpec.has_key(package):
98 
-            specName=self.mapPackageToSpec[package]
99 
-        if self.mapSerializableSpecObjects.has_key(specName):
100 
-            return self.mapSerializableSpecObjects[specName].specFile
101 
-        return None
102 
-
103 
-    def getSpecName(self, package):
104 
-        specName=""
105 
-        if self.mapPackageToSpec.has_key(package):
106 
-            specName=self.mapPackageToSpec[package]
107 
-        if self.mapSerializableSpecObjects.has_key(specName):
108 
-            return self.mapSerializableSpecObjects[specName].name
109 
-        return None
110 
-
77 
+        specName=self.getSpecName(package)
78 
+        return self.mapSerializableSpecObjects[specName].specFile
79 
+
111 80 
     def getPatches(self, package):
112 
-        specName=""
113 
-        if self.mapPackageToSpec.has_key(package):
114 
-            specName=self.mapPackageToSpec[package]
115 
-        if self.mapSerializableSpecObjects.has_key(specName):
116 
-            return self.mapSerializableSpecObjects[specName].listPatches
117 
-        return None
118 
-
81 
+        specName=self.getSpecName(package)
82 
+        return self.mapSerializableSpecObjects[specName].listPatches
83 
+
119 84 
     def getSources(self, package):
120 
-        specName=""
121 
-        if self.mapPackageToSpec.has_key(package):
122 
-            specName=self.mapPackageToSpec[package]
123 
-        if self.mapSerializableSpecObjects.has_key(specName):
124 
-            return self.mapSerializableSpecObjects[specName].listSources
125 
-        return None
126 
-
85 
+        specName=self.getSpecName(package)
86 
+        return self.mapSerializableSpecObjects[specName].listSources
87 
+
127 88 
     def getPackages(self, package):
128 
-        specName=""
89 
+        specName=self.getSpecName(package)
90 
+        return self.mapSerializableSpecObjects[specName].listPackages
91 
+
92 
+    def getSpecName(self,package):
129 93 
         if self.mapPackageToSpec.has_key(package):
130 94 
             specName=self.mapPackageToSpec[package]
131 
-        if self.mapSerializableSpecObjects.has_key(specName):
132 
-            return self.mapSerializableSpecObjects[specName].listPackages
133 
-        return None
134 
-
135 
-    def isValidPackage(self,package):
136 
-        if self.mapPackageToSpec.has_key(package):
137 
-            return True
138 
-        return False
95 
+            if self.mapSerializableSpecObjects.has_key(specName):
96 
+                return specName
97 
+        self.logger.error("Could not able to find "+package+" package from specs")
98 
+        raise Exception("Invalid package:"+package)
139 99
140 100 
     def printAllObjects(self):
141 101 
         listSpecs=self.mapSerializableSpecObjects.keys()
support/package-builder/ToolChainUtils.py
History View file @ 7acb019
... ... 
@@ -88,25 +88,22 @@ class ToolChainUtils(object):
88 88
89 89 
         self.logger.info("Installed core tool chain packages successfully on chroot:"+chrootID)
90 90
91 
-
92 
-
93 91 
     def findRPMFileInGivenLocation(self,package,rpmdirPath):
94 92 
         cmdUtils = CommandUtils()
95 93 
         listFoundRPMFiles = cmdUtils.findFile(package+"-*.rpm",rpmdirPath)
96 94 
         listFilterRPMFiles=[]
97 95 
         for f in listFoundRPMFiles:
98 
-            f1=f.replace(package,"")
99 
-            print f1
100 
-            l = f1.split("-")
101 
-            print l
102 
-            if len(l) == 3:
96 
+            rpmFileName=os.path.basename(f)
97 
+            checkRPMName=rpmFileName.replace(package,"")
98 
+            rpmNameSplit = checkRPMName.split("-")
99 
+            if len(rpmNameSplit) == 3:
103 100 
                 listFilterRPMFiles.append(f)
104 101 
         if len(listFilterRPMFiles) == 1 :
105 102 
             return listFilterRPMFiles[0]
106 103 
         if len(listFilterRPMFiles) == 0 :
107 104 
             return None
108 105 
         if len(listFilterRPMFiles) > 1 :
109 
-            print("Found multiple rpm files for given package in rpm directory.Unable to determine the rpm file for package:"+package)
106 
+            self.logger.error("Found multiple rpm files for given package in rpm directory.Unable to determine the rpm file for package:"+package)
110 107 
             return None
111 108
112 109 
     def buildCoreToolChainPackages(self):