commit: 24ec1400aa8c1b9aedae9a498e172d63cfe3705d
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 03:58:10 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu May 21 15:28:18 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=24ec1400
catalyst/support.py: Fix some leading whitespace rebase errors
Change a CatalystError to not print a traceback.
catalyst/support.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index 7957f08..2ac4816 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -152,17 +152,17 @@ def file_locate(settings,filelist,expand=1):
#filenames such as cdtar are optional, so we don't
assume the variable is defined.
pass
else:
- if len(settings[myfile])==0:
- raise CatalystError("File variable \"" + myfile +
+ if len(settings[myfile])==0:
+ raise CatalystError("File variable \"" + myfile
+
"\" has a length of zero (not
specified.)", print_traceback=True)
- if settings[myfile][0]=="/":
- if not os.path.exists(settings[myfile]):
- raise CatalystError("Cannot locate
specified " + myfile +
- ": "+settings[myfile],
print_traceback=True)
- elif expand and
os.path.exists(os.getcwd()+"/"+settings[myfile]):
- settings[myfile]=os.getcwd()+"/"+settings[myfile]
- else:
- raise CatalystError("Cannot locate specified " +
myfile +
+ if settings[myfile][0]=="/":
+ if not os.path.exists(settings[myfile]):
+ raise CatalystError("Cannot locate
specified " + myfile +
+ ": " + settings[myfile],
print_traceback=False)
+ elif expand and
os.path.exists(os.getcwd()+"/"+settings[myfile]):
+
settings[myfile]=os.getcwd()+"/"+settings[myfile]
+ else:
+ raise CatalystError("Cannot locate specified "
+ myfile +
": "+settings[myfile]+" (2nd try)" +
"""
Spec file format:
