Browse code

Revert "PackageManager: Fixed "go" build issue"

This reverts commit 40a4dcdabd39a25a5777a072015503986cdf592c.

Change-Id: I73c9f9146e19af3e292f65df24c3c95055529878
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5680
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Anish Swaminathan authored on 2018/09/14 07:37:25
Showing 1 changed files
... ...
@@ -50,8 +50,6 @@ class PackageManager(object):
50 50
         listFoundRPMPackages=[]
51 51
         listRPMFiles=[]
52 52
         listDirectorys=[]
53
-        mapPackageVersion={}
54
-        mapPackageRelease={}
55 53
         listDirectorys.append(constants.rpmPath)
56 54
         if constants.inputRPMSPath is not None:
57 55
             listDirectorys.append(constants.inputRPMSPath)
... ...
@@ -67,23 +65,11 @@ class PackageManager(object):
67 67
         pkgUtils = PackageUtils(self.logName,self.logPath)
68 68
         for rpmfile in listRPMFiles:
69 69
             package,version,release = pkgUtils.findPackageInfoFromRPMFile(rpmfile)
70
-            if package in mapPackageVersion:
71
-                mapPackageVersion[package].append(version)
72
-                mapPackageRelease[package].append(release)
73
-            else:
74
-                mapPackageVersion[package]=[version]
75
-                mapPackageRelease[package]=[release]
76
-        for package in mapPackageVersion:
77 70
             if SPECS.getData().isRPMPackage(package):
78
-                numVersions=SPECS.getData().getNumberOfVersions(package)
79
-                flag=True;
80
-                for index in range(0, numVersions):
81
-                        specVersion=SPECS.getData().getVersion(package,index)
82
-                        specRelease=SPECS.getData().getRelease(package,index)
83
-                        if  specVersion not in mapPackageVersion[package] and specRelease not in mapPackageRelease[package]:
84
-                                flag=False
85
-                if flag:
86
-                        listFoundRPMPackages.append(package)
71
+                specVersion=SPECS.getData().getVersion(package)
72
+                specRelease=SPECS.getData().getRelease(package)
73
+                if version == specVersion and release == specRelease:
74
+                    listFoundRPMPackages.append(package)
87 75
         #Mark package available only if all sub packages are available
88 76
         for package in listFoundRPMPackages:
89 77
             basePkg = SPECS.getData().getSpecName(package)