Merge branch 'apk' of https://github.com/fabaff/bcfg2

3 files changed, 62 insertions, 4 deletions

diff --git a/src/lib/Client/Tools/APK.py b/src/lib/Client/Tools/APK.py
new file mode 100644
index 000000000..5add7b7b4
--- /dev/null
+++ b/src/lib/Client/Tools/APK.py
@@ -0,0 +1,58 @@
+"""This provides Bcfg2 support for Alpine Linux APK packages."""
+__revision__ = '$Revision$'
+
+import Bcfg2.Client.Tools
+
+class APK(Bcfg2.Client.Tools.PkgTool):
+    """Support for Apk packages."""
+    name = 'APK'
+    __execs__ = ["/sbin/apk"]
+    __handles__ = [('Package', 'apk')]
+    __req__ = {'Package': ['name', 'version']}
+    pkgtype = 'apk'
+    pkgtool = ("/sbin/apk add %s", ("%s", ["name"]))
+
+    def __init__(self, logger, setup, config):
+        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+        self.installed = {}
+        self.RefreshPackages()
+
+    def RefreshPackages(self):
+        """Refresh memory hashes of packages."""
+        names = self.cmd.run("/sbin/apk info")[1]
+        nameversions = self.cmd.run("/sbin/apk info -v")[1]
+        for pkg in zip(names, nameversions):
+                pkgname = pkg[0]
+                version = pkg[1][len(pkgname)+1:]
+                self.logger.debug(" pkgname: %s\n version: %s" % (pkgname, version))
+                self.installed[pkgname] = version
+
+    def VerifyPackage(self, entry, modlist):
+        """Verify Package status for entry."""
+        if not 'version' in entry.attrib:
+            self.logger.info("Cannot verify unversioned package %s" %
+               (entry.attrib['name']))
+            return False
+
+        if entry.attrib['name'] in self.installed:
+            if entry.attrib['version'] == 'auto' or self.installed[entry.attrib['name']] == entry.attrib['version']:
+                #if not self.setup['quick'] and \
+                #                entry.get('verify', 'true') == 'true':
+                #FIXME: We should be able to check this once
+                #       http://trac.macports.org/ticket/15709 is implemented
+                return True
+            else:
+		self.loggger.info( " pkg %s at version %s, not %s" % (entry.attrib['name'],self.installed[entry.attrib['name']],entry.attrib['version']) )
+                entry.set('current_version', self.installed[entry.get('name')])
+                return False
+        entry.set('current_exists', 'false')
+        return False
+
+    def RemovePackages(self, packages):
+        """Remove extra packages."""
+        names = [pkg.get('name') for pkg in packages]
+        self.logger.info("Removing packages: %s" % " ".join(names))
+        self.cmd.run("/sbin/apk del %s" % \
+                     " ".join(names))
+        self.RefreshPackages()
+        self.extra = self.FindExtraPackages()
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py
index 34fb812c0..338ec98fd 100644
--- a/src/lib/Client/Tools/APT.py
+++ b/src/lib/Client/Tools/APT.py
@@ -1,4 +1,4 @@
-"""This is the bcfg2 support for apt-get"""
+"""This is the Bcfg2 support for apt-get."""
 __revision__ = '$Revision$'
 
 # suppress apt API warnings
@@ -239,5 +239,5 @@ class APT(Bcfg2.Client.Tools.Tool):
                 self.modified.append(package)
 
     def VerifyPath(self, entry, _):
-        """Do nothing here since we only verify Path type=ignore"""
+        """Do nothing here since we only verify Path type=ignore."""
         return True
diff --git a/src/lib/Client/Tools/Blast.py b/src/lib/Client/Tools/Blast.py
index 4f2891fd6..29cdfa116 100644
--- a/src/lib/Client/Tools/Blast.py
+++ b/src/lib/Client/Tools/Blast.py
@@ -1,5 +1,5 @@
 # This is the bcfg2 support for blastwave packages (pkg-get)
-"""This provides bcfg2 support for blastwave"""
+"""This provides Bcfg2 support for Blastwave."""
 __revision__ = '$Revision$'
 
 import tempfile
@@ -7,7 +7,7 @@ import Bcfg2.Client.Tools.SYSV
 
 
 class Blast(Bcfg2.Client.Tools.SYSV.SYSV):
-    """Support for Blastwave packages"""
+    """Support for Blastwave packages."""
     pkgtype = 'blast'
     pkgtool = ("/opt/csw/bin/pkg-get install %s", ("%s", ["bname"]))
     name = 'Blast'