diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-02-19 16:31:12 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-02-25 10:06:09 +0100 |
| commit | bc0872cc0b33379a2a4109c9b353ac81d10cec83 (patch) | |
| tree | 5f65dce76ba148ac792112557d98bea774291e72 /ipatests/test_integration/tasks.py | |
| parent | 792c3f9c8c65e24953241247a242490c8fb32492 (diff) | |
| download | freeipa-bc0872cc0b33379a2a4109c9b353ac81d10cec83.tar.gz freeipa-bc0872cc0b33379a2a4109c9b353ac81d10cec83.tar.xz freeipa-bc0872cc0b33379a2a4109c9b353ac81d10cec83.zip | |
ipatests: Fix incorrect order of operations when restoring backup
When restoring files from backup, we do use an incorrect order of
operations - we first restore SELinux context and then copy the
files from backup, when we need to do the exact opposite.
https://fedorahosted.org/freeipa/ticket/4133
Reviewed-By: Jan Pazdziora <jpazdziora@redhat.com>
Diffstat (limited to 'ipatests/test_integration/tasks.py')
| -rw-r--r-- | ipatests/test_integration/tasks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 9a6ea3fa5..b785f2819 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -137,7 +137,7 @@ def restore_files(host): # Run both commands in one session. For more information, see: # https://fedorahosted.org/freeipa/ticket/4133 - host.run_command('%s ; (%s ||:)' % (restorecon_command, copyfiles_command)) + host.run_command('%s ; (%s ||:)' % (copyfiles_command, restorecon_command)) # Remove all the files that did not exist and were 'backed up' host.run_command(['xargs', '-d', r'\n', '-a', rmname, 'rm', '-vf'], |