Code Review
/
pharos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix First MAC Address on LF-POD5 Jumphost"
[pharos.git]
/
config
/
utils
/
generate_config.py
diff --git
a/config/utils/generate_config.py
b/config/utils/generate_config.py
index
3710880
..
dfc6e6c
100755
(executable)
--- a/
config/utils/generate_config.py
+++ b/
config/utils/generate_config.py
@@
-57,12
+57,12
@@
ENV.filters['dpkg_arch'] = dpkg_arch
try:
DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml]))
except CalledProcessError as ex:
try:
DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml]))
except CalledProcessError as ex:
- logging.error('eyaml decryption failed
, keys might be missing
')
+ logging.error('eyaml decryption failed
!
')
except OSError as ex:
logging.warn('eyaml not found, skipping decryption')
try:
except OSError as ex:
logging.warn('eyaml not found, skipping decryption')
try:
- DICT
-except
NameError
as ex:
+ DICT
['details']
+except
(NameError, TypeError)
as ex:
logging.warn('PDF decryption skipped, fallback to using raw data.')
with open(ARGS.yaml) as _:
DICT = yaml.safe_load(_)
logging.warn('PDF decryption skipped, fallback to using raw data.')
with open(ARGS.yaml) as _:
DICT = yaml.safe_load(_)