sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.spm] move configuration protected file generator function into SpmPlugin class

Browse Source
This commit is contained in:
Fabio Erculiani
2010-07-04 17:02:26 +02:00
parent e961fb86e4
commit fd3449d6ce
2 changed files with 92 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libraries/entropy/client/interfaces/package.py
View File

@@ -2119,62 +2119,6 @@ class Package:
return my_remove_content
def __allocate_masked_file(self, maskfile, fromfile):
# check if file and tofile are equal
if os.path.isfile(maskfile) and os.path.isfile(fromfile):
old = entropy.tools.md5sum(fromfile)
new = entropy.tools.md5sum(maskfile)
if old == new:
return maskfile, False
counter = -1
newfile = ""
previousfile = ""
while True:
counter += 1
txtcounter = str(counter)
oldtxtcounter = str(counter-1)
txtcounter_len = 4-len(txtcounter)
cnt = 0
while cnt < txtcounter_len:
txtcounter = "0"+txtcounter
oldtxtcounter = "0"+oldtxtcounter
cnt += 1
newfile = os.path.join(os.path.dirname(maskfile),
"._cfg" + txtcounter + "_" + os.path.basename(maskfile))
if counter > 0:
previousfile = os.path.join(os.path.dirname(maskfile),
"._cfg" + oldtxtcounter + "_" + os.path.basename(maskfile))
else:
previousfile = os.path.join(os.path.dirname(maskfile),
"._cfg0000_" + os.path.basename(maskfile))
if not os.path.exists(newfile):
break
if not newfile:
newfile = os.path.join(os.path.dirname(maskfile),
"._cfg0000_" + os.path.basename(maskfile))
else:
if os.path.exists(previousfile):
# compare fromfile with previousfile
new = entropy.tools.md5sum(fromfile)
old = entropy.tools.md5sum(previousfile)
if new == old:
return previousfile, False
# compare old and new, if they match,
# suggest previousfile directly
new = entropy.tools.md5sum(maskfile)
old = entropy.tools.md5sum(previousfile)
if new == old:
return previousfile, False
return newfile, True
def _handle_config_protect(self, protect, mask, fromfile, tofile,
do_allocation_check = True, do_quiet = False):
"""
@@ -2279,7 +2223,9 @@ class Package:
prot_status = True
if do_allocation_check:
tofile, prot_status = self.__allocate_masked_file(tofile, fromfile)
spm_class = self._entropy.Spm_class()
tofile, prot_status = spm_class.allocate_protected_file(fromfile,
tofile)
if not prot_status:
# a protected file with the same content

89
libraries/entropy/spm/plugins/skel.py
View File

@@ -10,11 +10,14 @@
@todo: define SpmPlugin API
"""
import os
from entropy.const import etpConst
from entropy.core import Singleton
from entropy.misc import LogFile
import entropy.tools
class SpmPlugin(Singleton):
"""Base class for Source Package Manager plugins"""
@@ -777,6 +780,92 @@ class SpmPlugin(Singleton):
"""
raise NotImplementedError()
@staticmethod
def allocate_protected_file(package_file_path, destination_file_path):
"""
Allocate a configuration protected file. This method returns a new
destination_file_path value that is used by Entropy Client code to
merge file at package_file_path to live system.
This method offers basic support for Entropy ability to protect user
configuration files against overwrites. Any subclass can hook code
here in order to trigger extra actions on every acknowledged
path modification.
@param package_file_path: a valid file path pointing to the file
that Entropy Client is going to move to destination_file_path
@type package_file_path: string
@param destination_file_path: the default destination path for given
package_file_path. It points to the live system.
@type destination_file_path: string
@return: Tuple (of length 2) composed by (1) a new destination file
path. Please note that it can be the same of the one passed
(destination_file_path) if no protection is taken (for eg. when
md5 of proposed_file_path and destination_file_path is the same)
and (2) a bool informing if the function actually protected the
destination file. Unfortunately, the bool bit is stil required
in order to provide a valid new destination_file_path in any case.
@rtype tuple
"""
if os.path.isfile(destination_file_path) and \
os.path.isfile(package_file_path):
old = entropy.tools.md5sum(package_file_path)
new = entropy.tools.md5sum(destination_file_path)
if old == new:
return destination_file_path, False
dest_dirname = os.path.dirname(destination_file_path)
dest_basename = os.path.basename(destination_file_path)
counter = -1
newfile = ""
previousfile = ""
while True:
counter += 1
txtcounter = str(counter)
oldtxtcounter = str(counter-1)
txtcounter_len = 4-len(txtcounter)
cnt = 0
while cnt < txtcounter_len:
txtcounter = "0"+txtcounter
oldtxtcounter = "0"+oldtxtcounter
cnt += 1
newfile = os.path.join(dest_dirname,
"._cfg%s_%s" % (txtcounter, dest_basename,))
if counter > 0:
previousfile = os.path.join(dest_dirname,
"._cfg%s_%s" % (oldtxtcounter, dest_basename,))
else:
previousfile = os.path.join(dest_dirname,
"._cfg0000_%s" % (dest_basename,))
if not os.path.lexists(newfile):
break
if not newfile:
newfile = os.path.join(dest_dirname,
"._cfg0000_%s" % (dest_basename,))
else:
if os.path.exists(previousfile):
# compare package_file_path with previousfile
new = entropy.tools.md5sum(package_file_path)
old = entropy.tools.md5sum(previousfile)
if new == old:
return previousfile, False
# compare old and new, if they match,
# suggest previousfile directly
new = entropy.tools.md5sum(destination_file_path)
old = entropy.tools.md5sum(previousfile)
if new == old:
return previousfile, False
return newfile, True
def add_installed_package(self, package_metadata):
"""
Add package installed by Entropy to SPM database too.