|
13 | 13 | import requests |
14 | 14 | from singularity.logman import bot |
15 | 15 | from singularity.utils import get_installdir |
16 | | - |
| 16 | +from singularity.analysis.utils import get_packages |
17 | 17 | from singularity.views.utils import get_container_contents |
18 | 18 |
|
19 | 19 | from singularity.package import ( |
20 | 20 | load_package, |
21 | | - package |
| 21 | + package as make_package |
22 | 22 | ) |
23 | 23 |
|
24 | 24 | import pandas |
@@ -74,8 +74,8 @@ def compare_containers(container1=None,container2=None,by=None, |
74 | 74 | "total2": len(container2_guts[b])} |
75 | 75 |
|
76 | 76 | bot.logger.info("Intersect has length %s",len(intersect)) |
77 | | - bot.logger.info("Unique to %s: %s",container1,len(unique1)) |
78 | | - bot.logger.info("Unique to %s: %s",container2,len(unique2)) |
| 77 | + bot.logger.info("Unique to 1: %s",len(unique1)) |
| 78 | + bot.logger.info("Unique to 2: %s",len(unique2)) |
79 | 79 | comparisons[b] = comparison |
80 | 80 |
|
81 | 81 | return comparisons |
@@ -122,20 +122,18 @@ def compare_packages(packages_set1=None,packages_set2=None,by=None): |
122 | 122 | will be used (os vs. docker library) |
123 | 123 | :by: metrics to compare by (files.txt and or folders.txt) |
124 | 124 | ''' |
125 | | - package_folder = "%s/analysis/packages" %get_installdir() |
126 | | - |
127 | 125 | if packages_set1 == None: |
128 | | - packages_set1 = glob("%s/docker-library/*.zip" %(package_folder)) |
| 126 | + packages_set1 = get_packages('docker-library') |
129 | 127 | if packages_set2 == None: |
130 | | - packages_set2 = glob("%s/docker-os/*.zip" %(package_folder)) |
| 128 | + packages_set2 = get_packages('docker-os') |
131 | 129 |
|
132 | 130 | if by == None: |
133 | 131 | by = ['files.txt'] |
134 | 132 |
|
135 | 133 | if not isinstance(by,list): |
136 | 134 | by = [by] |
137 | 135 | if not isinstance(packages_set1,list): |
138 | | - packages_set1 = [package_set1] |
| 136 | + packages_set1 = [packages_set1] |
139 | 137 | if not isinstance(packages_set2,list): |
140 | 138 | packages_set2 = [packages_set2] |
141 | 139 |
|
|
0 commit comments