Code Review
/
oom
/
offline-installer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topic "OOM-1910"
[oom/offline-installer.git]
/
build
/
download
/
rpm_packages.py
diff --git
a/build/download/rpm_packages.py
b/build/download/rpm_packages.py
index
7f9700a
..
732af0e
100755
(executable)
--- a/
build/download/rpm_packages.py
+++ b/
build/download/rpm_packages.py
@@
-33,7
+33,7
@@
log = logging.getLogger(name=__name__)
def download(rpm_list, dst_dir):
if not base.check_tool('yumdownloader'):
log.error('ERROR: yumdownloader is not installed')
def download(rpm_list, dst_dir):
if not base.check_tool('yumdownloader'):
log.error('ERROR: yumdownloader is not installed')
- r
eturn 1
+ r
aise RuntimeError('yumdownloader missing')
rpm_set = base.load_list(rpm_list)
rpm_set = base.load_list(rpm_list)
@@
-41,11
+41,10
@@
def download(rpm_list, dst_dir):
log.info('Running command: {}'.format(command))
try:
subprocess.check_call(command.split())
log.info('Running command: {}'.format(command))
try:
subprocess.check_call(command.split())
- log.info('Downloaded')
except subprocess.CalledProcessError as err:
except subprocess.CalledProcessError as err:
- log.e
rror
(err.output)
- r
eturn err.returncode
-
+ log.e
xception
(err.output)
+ r
aise err
+ log.info('Downloaded')
def run_cli():
def run_cli():
@@
-59,7
+58,11
@@
def run_cli():
logging.basicConfig(stream=sys.stdout, level=logging.INFO, format='%(message)s')
logging.basicConfig(stream=sys.stdout, level=logging.INFO, format='%(message)s')
- sys.exit(download(args.rpm_list, args.output_dir))
+ try:
+ download(args.rpm_list, args.output_dir)
+ except (subprocess.CalledProcessError, RuntimeError):
+ sys.exit(1)
+
if __name__ == '__main__':
if __name__ == '__main__':