diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-09-18 11:26:14 +0200 | 
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-09-18 11:27:05 +0200 | 
| commit | dda9f655f94968b07043887a03e3bba176eb94d5 (patch) | |
| tree | af65cb7381cab373922878a38a936ca103927ccd | |
| parent | 4f8ebdd1d644dbc5094c1495932df3234d176b12 (diff) | |
| download | vyos-1x-dda9f655f94968b07043887a03e3bba176eb94d5.tar.gz vyos-1x-dda9f655f94968b07043887a03e3bba176eb94d5.zip | |
validator: T2417: bugfix on Python3 f'ormat strings
Commit 3639a5610b590a ("validator: T2417: try to make the code clearer")
introduced Python3 f'ormatted strings but missed the "f" keyword.
| -rwxr-xr-x | src/validators/script | 9 | 
1 files changed, 3 insertions, 6 deletions
| diff --git a/src/validators/script b/src/validators/script index 2665ec1f6..1d8a27e5c 100755 --- a/src/validators/script +++ b/src/validators/script @@ -1,8 +1,6 @@  #!/usr/bin/env python3  # -# numeric value validator -# -# Copyright (C) 2018 VyOS maintainers and contributors +# Copyright (C) 2018-2021 VyOS maintainers and contributors  #  # This program is free software; you can redistribute it and/or  # modify it under the terms of the GNU General Public License @@ -23,7 +21,6 @@ import shlex  import vyos.util -  if __name__ == '__main__':      if len(sys.argv) < 2:          sys.exit('Please specify script file to check') @@ -35,11 +32,11 @@ if __name__ == '__main__':          sys.exit(f'File {script} does not exist')      if not (os.path.isfile(script) and os.access(script, os.X_OK)): -        sys.exit('File {script} is not an executable file') +        sys.exit(f'File {script} is not an executable file')      # File outside the config dir is just a warning      if not vyos.util.file_is_persistent(script):          sys.exit( -            'Warning: file {path} is outside the / config directory\n' +            f'Warning: file {path} is outside the / config directory\n'              'It will not be automatically migrated to a new image on system update'          ) | 
