almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

better logging for removepkg/removefrom

Browse Source 
emit a useful log message if we attempt to removepkg something that
isn't installed, or if a glob used in a removefrom line matches no
files.

this will help us keep the templates cleaner.
This commit is contained in:
Will Woods 2011-08-01 17:24:20 -04:00
parent ace169c28d
commit 9f6393c58e
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pylorax/ltmpl.py
View File

@ -123,6 +123,9 @@ class LoraxTemplateRunner(object):
pkglist = self.yum.doPackageLists(pkgnarrow="installed", patterns=pkgs) pkglist = self.yum.doPackageLists(pkgnarrow="installed", patterns=pkgs)
return set([f for pkg in pkglist.installed for f in pkg.filelist]) return set([f for pkg in pkglist.installed for f in pkg.filelist])
def _getsize(self, *files):
return sum(os.path.getsize(self._out(f)) for f in files if os.path.isfile(self._out(f)))
def run(self, templatefile, **variables): def run(self, templatefile, **variables):
for k,v in self.defaults.items() + self.builtins.items(): for k,v in self.defaults.items() + self.builtins.items():
variables.setdefault(k,v) variables.setdefault(k,v)
@ -231,7 +234,7 @@ class LoraxTemplateRunner(object):
'''Note that we need full paths for everything here''' '''Note that we need full paths for everything here'''
chdir = lambda: None chdir = lambda: None
cmd = cmdlist cmd = cmdlist
if cmd[0].startswith("chdir="): if cmd[0].startswith("--chdir="):
dirname = cmd[0].split('=',1)[1] dirname = cmd[0].split('=',1)[1]
chdir = lambda: os.chdir(dirname) chdir = lambda: os.chdir(dirname)
cmd = cmd[1:] cmd = cmd[1:]
@ -242,9 +245,13 @@ class LoraxTemplateRunner(object):
self.yum.install(pattern=p) self.yum.install(pattern=p)
def removepkg(self, *pkgs): def removepkg(self, *pkgs):
# NOTE: "for p in pkgs: self.yum.remove(pattern=p)" traces back, so.. for p in pkgs:
filepaths = [f.lstrip('/') for f in self._filelist(*pkgs)] filepaths = [f.lstrip('/') for f in self._filelist(p)]
if filepaths:
logger.debug("removepkg %s: %ikb", p, self._getsize(*filepaths)/1024)
self.remove(*filepaths) self.remove(*filepaths)
else:
logger.debug("removepkg %s: no files to remove!", p)
def run_pkg_transaction(self): def run_pkg_transaction(self):
self.yum.buildTransaction() self.yum.buildTransaction()
@ -254,7 +261,12 @@ class LoraxTemplateRunner(object):
self.yum.closeRpmDB() self.yum.closeRpmDB()
def removefrom(self, pkg, *globs): def removefrom(self, pkg, *globs):
globs_re = re.compile("|".join([fnmatch.translate(g) for g in globs])) filelist = self._filelist(pkg)
remove = filter(globs_re.match, self._filelist(pkg)) for g in globs:
logger.debug("removing %i files from %s", len(remove), pkg) globs_re = re.compile(fnmatch.translate(g))
remove = filter(globs_re.match, filelist)
if remove:
logger.debug("removefrom %s %s: %i files, %ikb", pkg, g, len(remove), self._getsize(*remove)/1024)
self.remove(*remove) self.remove(*remove)
else:
logger.debug("removefrom %s %s: no files to remove!", pkg, g)