From 8fb4415e6dae99a6fa710106fa086cea8b34182d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Nov 2008 17:46:49 +0000 Subject: Make FindPortdir() return (None, None, None) on failure, instead of raising a potentially ambiguous ValueError. svn path=/main/trunk/; revision=11853 --- bin/repoman | 5 ++--- pym/repoman/utilities.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index 5db3b607..f9900781 100755 --- a/bin/repoman +++ b/bin/repoman @@ -481,9 +481,8 @@ if options.mode in ('last', 'lfull'): # commit (like if Manifest generation fails). can_force = True -try: - portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings) -except ValueError: +portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings) +if portdir is None: sys.exit(1) vcs = None diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index cc654154..807ff1ba 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -393,7 +393,7 @@ def FindPortdir(settings): msg = 'Repoman is unable to determine PORTDIR or PORTDIR_OVERLAY' + \ ' from the current working directory' logging.critical(msg) - raise ValueError(msg) + return (None, None, None) if not portdir: portdir = settings["PORTDIR"] -- cgit v1.2.3-65-gdbad