diff --git a/src/salix-live-installer/__init__.py b/src/salix-live-installer/__init__.py index c8daf5d..910e210 100644 --- a/src/salix-live-installer/__init__.py +++ b/src/salix-live-installer/__init__.py @@ -16,7 +16,6 @@ from keyboard import * from language import * from mounting import * -from package import * from salt import * from timezone import * from user import * diff --git a/src/salix-live-installer/package.py b/src/salix-live-installer/package.py deleted file mode 100644 index fca93c2..0000000 --- a/src/salix-live-installer/package.py +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# vim: set et ai sta sw=2 ts=2 tw=0: -""" -Help installing Slackware packages -""" diff --git a/src/salix-live-installer/user.py b/src/salix-live-installer/user.py index 880dcbc..4bca09f 100644 --- a/src/salix-live-installer/user.py +++ b/src/salix-live-installer/user.py @@ -2,5 +2,27 @@ # -*- coding: utf-8 -*- # vim: set et ai sta sw=2 ts=2 tw=0: """ -Functions to handle users and groups +Functions to handle users and groups: + - listRegularUsers + - """ +from execute import * +import os + +def listRegularUsers(): + """ + Returns a sorted list of regular users, i.e. users with id ≥ 1000. + """ + ret = [] + for line in open('/etc/passwd', 'r').read().splitlines(): + user, _, uid, _ = line.split(':', 3) + if int(uid) >= 1000: + ret.append(user) + return sorted(ret) + +# Unit test +if __name__ == '__main__': + from assertPlus import * + users = listRegularUsers() + print users + assertTrue(len(users) > 0)