1329 resolving_pkgs.add(pfmri.pkg_name) |
1329 resolving_pkgs.add(pfmri.pkg_name) |
1330 |
1330 |
1331 pkg_list = None |
1331 pkg_list = None |
1332 if use_system: |
1332 if use_system: |
1333 # We make this a list because we want to reuse the list of |
1333 # We make this a list because we want to reuse the list of |
1334 # packages again, and despite it's name, get_pkg_list is a |
1334 # packages again, and despite its name, get_pkg_list is a |
1335 # generator. |
1335 # generator. |
1336 pkg_list = list(api_inst.get_pkg_list( |
1336 pkg_list = list(api_inst.get_pkg_list( |
1337 api.ImageInterface.LIST_INSTALLED)) |
1337 api.ImageInterface.LIST_INSTALLED)) |
1338 for (pub, stem, ver), summ, cats, states in pkg_list: |
1338 for (pub, stem, ver), summ, cats, states, attrs in pkg_list: |
1339 pfmri = fmri.PkgFmri("pkg:/%s@%s" % (stem, ver), "5.11") |
1339 pfmri = fmri.PkgFmri("pkg:/%s@%s" % (stem, ver), "5.11") |
1340 if pfmri.pkg_name in resolving_pkgs: |
1340 if pfmri.pkg_name in resolving_pkgs: |
1341 continue |
1341 continue |
1342 mfst = api_inst.get_manifest(pfmri, all_variants=True) |
1342 mfst = api_inst.get_manifest(pfmri, all_variants=True) |
1343 distro_vars.merge_values(mfst.get_all_variants()) |
1343 distro_vars.merge_values(mfst.get_all_variants()) |
1353 distro_vars) |
1353 distro_vars) |
1354 |
1354 |
1355 # Build a list of all files delivered in the packages installed on |
1355 # Build a list of all files delivered in the packages installed on |
1356 # the system. |
1356 # the system. |
1357 if use_system: |
1357 if use_system: |
1358 for (pub, stem, ver), summ, cats, states in pkg_list: |
1358 for (pub, stem, ver), summ, cats, states, attrs in pkg_list: |
1359 pfmri = fmri.PkgFmri("pkg:/%s@%s" % (stem, ver), "5.11") |
1359 pfmri = fmri.PkgFmri("pkg:/%s@%s" % (stem, ver), "5.11") |
1360 if pfmri.pkg_name in resolving_pkgs: |
1360 if pfmri.pkg_name in resolving_pkgs: |
1361 continue |
1361 continue |
1362 mfst = api_inst.get_manifest(pfmri, all_variants=True) |
1362 mfst = api_inst.get_manifest(pfmri, all_variants=True) |
1363 add_fmri_path_mapping(files.installed, links, |
1363 add_fmri_path_mapping(files.installed, links, |