equal
deleted
inserted
replaced
19 # |
19 # |
20 # CDDL HEADER END |
20 # CDDL HEADER END |
21 # |
21 # |
22 |
22 |
23 # |
23 # |
24 # Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. |
24 # Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. |
25 # |
25 # |
26 |
26 |
27 import copy |
27 import copy |
28 import itertools |
28 import itertools |
29 import operator |
29 import operator |
1690 |
1690 |
1691 resolving_pkgs = set() |
1691 resolving_pkgs = set() |
1692 |
1692 |
1693 for mp, (name, pfmri), mfst, pkg_vars, miss_files in manifests: |
1693 for mp, (name, pfmri), mfst, pkg_vars, miss_files in manifests: |
1694 distro_vars.merge_values(pkg_vars) |
1694 distro_vars.merge_values(pkg_vars) |
1695 if pfmri: |
1695 try: |
1696 resolving_pkgs.add(pfmri.pkg_name) |
1696 if pfmri is None: |
|
1697 pfmri = fmri.PkgFmri(name) |
|
1698 except fmri.IllegalFmri as e: |
|
1699 raise BadPackageFmri(mp, e) |
|
1700 resolving_pkgs.add(pfmri.pkg_name) |
1697 |
1701 |
1698 def __merge_actvct_with_pkgvct(act_vct, pkg_vct): |
1702 def __merge_actvct_with_pkgvct(act_vct, pkg_vct): |
1699 act_vct.merge_unknown(pkg_vct) |
1703 act_vct.merge_unknown(pkg_vct) |
1700 return variants.VariantCombinations(act_vct, satisfied=True) |
1704 return variants.VariantCombinations(act_vct, satisfied=True) |
1701 |
1705 |