Merge branch 'master' of ssh://nickel.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable
This commit is contained in:
commit
e45fcb66eb
|
|
@ -379,8 +379,10 @@ class RodBindingArgumentTypeDescriptor extends ArgumentTypeDescriptor {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( tribbleType == null )
|
if ( tribbleType == null )
|
||||||
if ( ! file.canRead() | ! file.isFile() ) {
|
if ( ! file.exists() ) {
|
||||||
throw new UserException.CouldNotReadInputFile(file, "file does exist or couldn't be read");
|
throw new UserException.CouldNotReadInputFile(file, "file does not exist");
|
||||||
|
} else if ( ! file.canRead() || ! file.isFile() ) {
|
||||||
|
throw new UserException.CouldNotReadInputFile(file, "file could not be read");
|
||||||
} else {
|
} else {
|
||||||
throw new UserException.CommandLineException(
|
throw new UserException.CommandLineException(
|
||||||
String.format("No tribble type was provided on the command line and the type of the file could not be determined dynamically. " +
|
String.format("No tribble type was provided on the command line and the type of the file could not be determined dynamically. " +
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue