diff --git a/osc/build.py b/osc/build.py index 5199ec3b..1834ef01 100644 --- a/osc/build.py +++ b/osc/build.py @@ -694,10 +694,10 @@ def main(apiurl, opts, argv): if pkg_meta_e: print('ERROR: Either wrong repo/arch as parameter or a parse error of .spec/.dsc/.kiwi file due to syntax error', file=sys.stderr) else: - print('The package \'%s\' does not exists - please ' \ + print('The package \'%s\' does not exist - please ' \ 'rerun with \'--local-package\'' % pac, file=sys.stderr) else: - print('The project \'%s\' does not exists - please ' \ + print('The project \'%s\' does not exist - please ' \ 'rerun with \'--alternative-project \'' % prj, file=sys.stderr) sys.exit(1) else: diff --git a/osc/commandline.py b/osc/commandline.py index d9023a9e..18f73e93 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -8149,7 +8149,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. """ if not os.path.isfile(source): - raise oscerr.WrongArgs("Source file '%s' does not exists or is no file" % source) + raise oscerr.WrongArgs("Source file '%s' does not exist or is not a file" % source) if not opts.force and os.path.isfile(dest): raise oscerr.WrongArgs("Dest file '%s' already exists" % dest) if os.path.isdir(dest): diff --git a/osc/core.py b/osc/core.py index 3d6bcc27..0e4dc6f7 100644 --- a/osc/core.py +++ b/osc/core.py @@ -2989,14 +2989,14 @@ def slash_split(l): def expand_proj_pack(args, idx=0, howmany=0): """looks for occurance of '.' at the position idx. If howmany is 2, both proj and pack are expanded together - using the current directory, or none of them, if not possible. + using the current directory, or none of them if not possible. If howmany is 0, proj is expanded if possible, then, if there is no idx+1 element in args (or args[idx+1] == '.'), pack is also expanded, if possible. If howmany is 1, only proj is expanded if possible. - If args[idx] does not exists, an implicit '.' is assumed. - if not enough elements up to idx exist, an error is raised. + If args[idx] does not exist, an implicit '.' is assumed. + If not enough elements up to idx exist, an error is raised. See also parseargs(args), slash_split(args), findpacs(args) All these need unification, somehow.