From 6b2bf7a08c63debfc8e053f989d1fb3986606e17 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Wed, 19 Dec 2007 11:44:04 +0000 Subject: [PATCH] better handle conf files backup git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@916 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- client/confTools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/confTools.py b/client/confTools.py index ab013a459..53779f48e 100644 --- a/client/confTools.py +++ b/client/confTools.py @@ -102,10 +102,10 @@ def update(): # old file backup if etpConst['filesbackup'] and os.path.isfile(etpConst['systemroot']+scandata[key]['destination']): bcount = 0 - backupfile = etpConst['systemroot']+scandata[key]['destination']+".equo_backup."+unicode(bcount) + backupfile = etpConst['systemroot']+os.path.dirname(scandata[key]['destination'])+"/._equo_backup."+unicode(bcount)+"_"+os.path.basename(scandata[key]['destination']) while os.path.lexists(backupfile): bcount += 1 - backupfile = etpConst['systemroot']+scandata[key]['destination']+".equo_backup."+unicode(bcount) + backupfile = etpConst['systemroot']+os.path.dirname(scandata[key]['destination'])+"/._equo_backup."+unicode(bcount)+"_"+os.path.basename(scandata[key]['destination']) shutil.copy2(etpConst['systemroot']+scandata[key]['destination'],backupfile) shutil.move(etpConst['systemroot']+scandata[key]['source'],etpConst['systemroot']+scandata[key]['destination']) @@ -174,10 +174,10 @@ def update(): # old file backup if etpConst['filesbackup'] and os.path.isfile(etpConst['systemroot']+scandata[cmd]['destination']): bcount = 0 - backupfile = etpConst['systemroot']+scandata[cmd]['destination']+".equo_backup."+unicode(bcount) + backupfile = etpConst['systemroot']+os.path.dirname(scandata[cmd]['destination'])+"/._equo_backup."+unicode(bcount)+"_"+os.path.basename(scandata[cmd]['destination']) while os.path.lexists(backupfile): bcount += 1 - backupfile = etpConst['systemroot']+scandata[cmd]['destination']+".equo_backup."+unicode(bcount) + backupfile = etpConst['systemroot']+os.path.dirname(scandata[cmd]['destination'])+"/._equo_backup."+unicode(bcount)+"_"+os.path.basename(scandata[cmd]['destination']) shutil.copy2(etpConst['systemroot']+scandata[cmd]['destination'],backupfile) shutil.move(etpConst['systemroot']+scandata[cmd]['source'],etpConst['systemroot']+scandata[cmd]['destination'])