diff options
author | John Dennis <jdennis@redhat.com> | 2007-11-06 16:26:10 -0500 |
---|---|---|
committer | John Dennis <jdennis@redhat.com> | 2007-11-06 16:26:10 -0500 |
commit | 22493d9b9fbc0b6a2e35397ab7b6a62740fcfe7a (patch) | |
tree | 0c940d0ccb6db58b87b656bc2b149ee14da30e48 /ipa-python | |
parent | 50c383aeedeca63fbcd54963d8378214a6c13559 (diff) | |
download | freeipa-22493d9b9fbc0b6a2e35397ab7b6a62740fcfe7a.tar.gz freeipa-22493d9b9fbc0b6a2e35397ab7b6a62740fcfe7a.tar.xz freeipa-22493d9b9fbc0b6a2e35397ab7b6a62740fcfe7a.zip |
remove offensive use of rpm
add the radiusprofile to the list of objectclasses used when creating a user
Diffstat (limited to 'ipa-python')
-rw-r--r-- | ipa-python/ipautil.py | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py index 96a74d757..e7f594191 100644 --- a/ipa-python/ipautil.py +++ b/ipa-python/ipautil.py @@ -30,7 +30,6 @@ from string import lower import re import xmlrpclib import datetime -import rpm def realm_to_suffix(realm_name): s = realm_name.split(".") @@ -332,38 +331,3 @@ def parse_generalized_time(timestr): except ValueError: return None -#------------------------------------------------------------------------------- - -def get_rpm_nvr_from_header(hdr): - 'Given an RPM header return the package NVR as a string' - name = hdr['name'] - version = hdr['version'] - release = hdr['release'] - - return '%s-%s-%s' % (name, version, release) - -def get_rpm_nvr_by_name(name): - if name is None: - return None - - nvr = None - try: - ts = rpm.ts() - mi = ts.dbMatch(rpm.RPMTAG_NAME, name) - for h in mi: - nvr = get_rpm_nvr_from_header(h) - break - except: - logging.exception('failed to retrieve rpm info for %s', name) - return nvr - -def split_rpm_nvr(nvr): - components = nvr.split('-') - release = components[-1] - version = components[-2] - name = '-'.join(components[:-2]) - return (name, version, release) - - - - |