diff options
Diffstat (limited to 'src/yum/providers/util/common.py')
| -rw-r--r-- | src/yum/providers/util/common.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/yum/providers/util/common.py b/src/yum/providers/util/common.py index f70d22b..00f702f 100644 --- a/src/yum/providers/util/common.py +++ b/src/yum/providers/util/common.py @@ -909,7 +909,7 @@ class YumFileCheck: flags.append(v) return flags - def filecheck2model(vpkg, fn, env, keys_only=True, model=None): + def filecheck2model(vpkg, fn, env, keys_only=True, model=None, fc=None): if not isinstance(vpkg, yum.packages._RPMVerifyPackage): raise TypeError( "vpkg must be an instance of _RPMVerifyPackage") @@ -920,6 +920,9 @@ class YumFileCheck: model = pywbem.CIMInstanceName(classname, namespace=namespace) if not keys_only: model = pywbem.CIMInstance(classname, path=model) + if fc is not None: + if not isinstance(fc, YumFileCheck.FileCheck): + raise TypeError("fc must be an instance of FileCheck") pkg = vpkg.po vpf = vpkg._files[fn] model['Name'] = vpf.filename @@ -942,7 +945,8 @@ class YumFileCheck: model['ChecksumType'] = csumt = \ YumFileCheck.checksumtype_str2pywbem( pkg.yumdb_info.checksum_type) - fc = YumFileCheck.test_file(env, csumt, vpf) + if fc is None: + fc = YumFileCheck.test_file(env, csumt, vpf) for mattr, fattr in ( ('FileType', 'file_type'), ('FileUserID', 'user_id'), |