From: Joerg Jaspert Date: Sun, 18 Oct 2015 12:17:05 +0000 (+0200) Subject: Adjust to deal with the new Debian supplementaryGid X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=98d086ddda3772fb58c1bfa97478e8044596b569;p=dak.git Adjust to deal with the new Debian supplementaryGid Signed-off-by: Joerg Jaspert --- diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py index ae99ef90..ed121398 100755 --- a/dak/import_users_from_passwd.py +++ b/dak/import_users_from_passwd.py @@ -30,6 +30,7 @@ ################################################################################ import pwd +import grp import sys import re import apt_pkg @@ -73,15 +74,18 @@ def main (): usage(1) session = DBConn().session() - valid_gid = int(cnf.get("Import-Users-From-Passwd::ValidGID","")) + valid_gid = cnf.get("Import-Users-From-Passwd::ValidGID", "") + if valid_gid: + debiangrp = grp.getgrnam(valid_gid).gr_mem + else: + debiangrp = [] passwd_unames = {} for entry in pwd.getpwall(): uname = entry[0] - gid = entry[3] - if valid_gid and gid != valid_gid: + if uname not in debiangrp: if Options["Verbose"]: - print "Skipping %s (GID %s != Valid GID %s)." % (uname, gid, valid_gid) + print "Skipping %s (Not in group %s)." % (uname, valid_gid) continue passwd_unames[uname] = ""