From 592b1659cf338eb61e64e1bf4cb27037ffe4619b Mon Sep 17 00:00:00 2001 From: sgurumurthy Date: Sun, 31 Jul 2016 13:50:22 -0700 Subject: [PATCH] Closes-Bug: #1594994 Set the storage repo properly when adding a storage tgz package Change-Id: I00b16947044042dc4bc1324ed6cb25a083c2650c --- src/server_mgr_main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py index bafe1f9c..e7b9b50e 100755 --- a/src/server_mgr_main.py +++ b/src/server_mgr_main.py @@ -2328,9 +2328,9 @@ def _create_storage_deb_repo( if 'Debian binary package' in output: cmd = ("mv ./opt/contrail/contrail_packages/contrail_storage_debs.tgz .") subprocess.check_call(cmd, shell=True) - + #Since CentOS is new but default repopinning will be enabled for it # check if its a new version where repo pinning changes are brought in - if os.path.isfile('./opt/contrail/contrail_packages/.repo_pinning'): + if os.path.isfile('./opt/contrail/contrail_packages/.repo_pinning') or (output and 'gzip compressed data' in output): repo_pinning = True else: repo_pinning = False @@ -2340,9 +2340,9 @@ def _create_storage_deb_repo( # untar tgz to get all packages cmd = ("tar xvzf contrail_storage_debs.tgz > /dev/null") subprocess.check_call(cmd, shell=True) - # remove the tgz file itself, not needed any more - cmd = ("rm -f contrail_storage_debs.tgz") - subprocess.check_call(cmd, shell=True) + # remove the tgz file itself, not needed any more + cmd = ("rm -f contrail_storage_debs.tgz") + subprocess.check_call(cmd, shell=True) # if repo pinning is enabled use reprepo to create the repo if repo_pinning: