stackforge/libra
Code Issues Proposed changes

Merge "Cleanup: Remove duplicate file copy code."

Browse Source
This commit is contained in:
Jenkins 2013-04-19 14:55:05 +00:00 committed by Gerrit Code Review
commit 12f2e4bb37
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libra/worker/drivers/haproxy/ubuntu_services.py
View File

@ -95,14 +95,7 @@ class UbuntuServices(ServicesBase):
# Copy any existing configuration file to a backup.
if os.path.exists(self._config_file):
copy_cmd = "/usr/bin/sudo -n /bin/cp %s %s" % (self._config_file,
self._backup_config)
try:
subprocess.check_output(copy_cmd.split(),
stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
raise Exception("Failed to copy configuration file: %s\n%s"
% (e, e.output.rstrip('\n')))
self.sudo_copy(self._config_file, self._backup_config)
# Move the temporary config file to production version.
move_cmd = "/usr/bin/sudo -n /bin/mv %s %s" % (tmpfile,