diff options
Diffstat (limited to 'calm/tool_util.py')
-rw-r--r-- | calm/tool_util.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/calm/tool_util.py b/calm/tool_util.py index 712b0e2..f677f86 100644 --- a/calm/tool_util.py +++ b/calm/tool_util.py @@ -43,26 +43,19 @@ def split(pvr): def permitted(p): - # check CYGNAME is a maintainer for package cygname = os.environ.get('CYGNAME', None) if not cygname: logging.error("who are you?") return False - mlist = {} - mlist = maintainers.add_packages(mlist, common_constants.PKGMAINT) - # CYGNAME is a maintainer for package - if p in mlist[cygname].pkgs: + pkg_list = maintainers.pkg_list(common_constants.PKGMAINT) + if cygname in pkg_list[p].maintainers(): return True # CYGNAME is a trusted maintainer if cygname in common_constants.TRUSTEDMAINT.split('/'): return True - if cygname not in mlist: - logging.error("'%s' is not a package maintainer" % (cygname)) - return False - logging.error("package '%s' is not in the package list for maintainer '%s'" % (p, cygname)) return False |