diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-11 17:46:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-11 17:46:49 +0000 |
| commit | 8fb4415e6dae99a6fa710106fa086cea8b34182d (patch) | |
| tree | 4f98d0a9457b00348264b73966128f04383264ce | |
| parent | Inside have_profile_dir(), check for existence of profiles.desc since that (diff) | |
| download | portage-multirepo-8fb4415e6dae99a6fa710106fa086cea8b34182d.tar.gz portage-multirepo-8fb4415e6dae99a6fa710106fa086cea8b34182d.tar.bz2 portage-multirepo-8fb4415e6dae99a6fa710106fa086cea8b34182d.zip | |
Make FindPortdir() return (None, None, None) on failure, instead of raising
a potentially ambiguous ValueError.
svn path=/main/trunk/; revision=11853
| -rwxr-xr-x | bin/repoman | 5 | ||||
| -rw-r--r-- | 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"] |