From 5704e4c57ffd025aa374f33b0bbd0233f6ed9427 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sat, 9 May 2015 19:12:54 +0200 Subject: [PATCH] Minor fixes --- neuf_userinfo/management/commands/stale_users.py | 2 +- neuf_userinfo/ssh.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/neuf_userinfo/management/commands/stale_users.py b/neuf_userinfo/management/commands/stale_users.py index 440d895..721aca6 100644 --- a/neuf_userinfo/management/commands/stale_users.py +++ b/neuf_userinfo/management/commands/stale_users.py @@ -47,7 +47,7 @@ class Command(BaseCommand): inside_users = inside_users.exclude( Q(ldap_username__isnull=True) | Q(registration_status='partial') - | Q(ldap_password__isnull=True)).values_list('username', flat=True) + | Q(ldap_password__isnull=True)).values_list('ldap_username', flat=True) if self.options['verbosity'] == '3': self.stdout.write('Found {} Inside users'.format(len(inside_users))) diff --git a/neuf_userinfo/ssh.py b/neuf_userinfo/ssh.py index ffa3284..2621d04 100644 --- a/neuf_userinfo/ssh.py +++ b/neuf_userinfo/ssh.py @@ -45,9 +45,13 @@ def get_home_dirs(): host_string = '{}@{}'.format(settings.FILESERVER_SSH_USER, settings.FILESERVER_HOST) fabric_settings = _get_fabric_settings(host_string) + separator = '\r\n{}'.format(settings.FILESERVER_HOME_PATH) + if settings.FILESERVER_HOME_PATH[-1] != '/': + separator = '{}/'.format(separator) + with fab_settings(**fabric_settings): with hide('running', 'stdout', 'stderr'): homedirs_str = run('find {} -maxdepth 1 -type d'.format(settings.FILESERVER_HOME_PATH)) - homedirs = homedirs_str.split('\r\n{}'.format(settings.FILESERVER_HOME_PATH))[1:] + homedirs = homedirs_str.split(separator)[1:] return homedirs \ No newline at end of file