Change in vdsm[master]: misc: remove cp parameter

Yeela Kaplan has uploaded a new change for review.

Change subject: misc: remove cp parameter
......................................................................

misc: remove cp parameter

All usages of cp parameter have been extinguished.
Therefore, no longer needed.

Change-Id: I0906bfd7dfa128c323aa399810bbd75883618434
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com&gt;
---
M vdsm/storage/misc.py
1 file changed, 5 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/45613/1

diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index b14fd26..b0146c8 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -449,7 +449,7 @@
     return n
 
 
-def rotateFiles(directory, prefixName, gen, cp=False, persist=False):
+def rotateFiles(directory, prefixName, gen, persist=False):
     log.debug("dir: %s, prefixName: %s, versions: %s" %
               (directory, prefixName, gen))
     gen = int(gen)
@@ -477,24 +477,16 @@
     for key in keys:
         oldName = os.path.join(directory, fd[key]['old'])
         newName = os.path.join(directory, fd[key]['new'])
-        if utils.isOvirtNode() and persist and not cp:
+        if utils.isOvirtNode() and persist:
             try:
                 utils.unpersist(oldName)
                 utils.unpersist(newName)
             except:
                 pass
-        try:
-            if cp:
-                execCmd([constants.EXT_CP, oldName, newName], sudo=True)
-                if (utils.isOvirtNode() and
-                        persist and not os.path.exists(newName)):
-                    utils.persist(newName)
 
-            else:
-                os.rename(oldName, newName)
-        except:
-            pass
-        if utils.isOvirtNode() and persist and not cp:
+        os.rename(oldName, newName)
+
+        if utils.isOvirtNode() and persist:
             try:
                 utils.persist(newName)
             except:


-- 
To view, visit https://gerrit.ovirt.org/45613
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0906bfd7dfa128c323aa399810bbd75883618434
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;