diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-02-20 09:32:25 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-02-20 09:32:25 -0500 |
| commit | f82b3b0b284f7723da910583b9262ac095a96ffc (patch) | |
| tree | a6dcc70def4d701201d71411fff8d3748edde8dc /ipa-admintools | |
| parent | 38175775250c65ca2427802521080b80a7d0b295 (diff) | |
| download | freeipa-f82b3b0b284f7723da910583b9262ac095a96ffc.tar.gz freeipa-f82b3b0b284f7723da910583b9262ac095a96ffc.tar.xz freeipa-f82b3b0b284f7723da910583b9262ac095a96ffc.zip | |
Handle input range properly and catch KeyboardInterrupt and exit gracefully
433496
Diffstat (limited to 'ipa-admintools')
| -rw-r--r-- | ipa-admintools/ipa-findgroup | 5 | ||||
| -rw-r--r-- | ipa-admintools/ipa-finduser | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup index 4f25ade39..08d623141 100644 --- a/ipa-admintools/ipa-findgroup +++ b/ipa-admintools/ipa-findgroup @@ -74,7 +74,10 @@ def main(): print "Please refine your search and try again." if counter > 1: - groupindex = ipaadminutil.select_group(counter, groups) + try: + groupindex = ipaadminutil.select_group(counter, groups) + except KeyboardInterrupt: + return 1 if groupindex == "q": return 0 diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index 81da24efd..30a6cd257 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -97,10 +97,12 @@ def main(): print "Please refine your search and try again." if counter > 1: - userindex = ipaadminutil.select_user(counter, users) + try: + userindex = ipaadminutil.select_user(counter, users) + except KeyboardInterrupt: + return 1 if userindex == "q": - return - + return 0 if userindex >= 0: users = [users[userindex]] |