- added snapper-zypp-plugin subpackage (fate #308626)

diff --git a/package/snapper.changes b/package/snapper.changes
index 8bdf0d13f908654a43a19901652ce1810fa2f564..fd05316035ede74c01e7a31885c069c7f82e1bc0 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 28 11:46:28 CEST 2011 - aschnell@suse.de
+
+- added snapper-zypp-plugin subpackage (fate #308626)
+
 -------------------------------------------------------------------
 Fri Jun 17 11:02:48 CEST 2011 - aschnell@suse.de
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 38d9c9a057fbebd81a66699c6279de38cd474523..90c76f9bb34c27efbda2f8397f21ee5b88d779cf 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,9 +2,10 @@
 # Makefile.am for snapper/scripts
 #
 
-EXTRA_DIST = snapper-hourly snapper-daily
+EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py
 
 install-data-local:
        install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper
        install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper
+       install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py
 

diff --git a/scripts/zypp-plugin.py b/scripts/zypp-plugin.py
new file mode 100755 (executable)
index 0000000..179d8a3
--- /dev/null
+++ b/scripts/zypp-plugin.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+from subprocess import Popen, PIPE
+from zypp_plugin import Plugin
+
+class MyPlugin(Plugin):
+
+  def PLUGINBEGIN(self, headers, body):
+
+    args = ["snapper", "create", "--type=pre", "--print-number", "--description=zypp"]
+    self.o = Popen(args, stdout=PIPE).communicate()[0].strip()
+
+    self.ack()
+
+  def PLUGINEND(self, headers, body):
+
+    args = ["snapper", "create", "--type=post", "--pre-number=%s" % self.o]
+    Popen(args)
+
+    self.ack()
+    sys.exit(0)
+
+plugin = MyPlugin()
+plugin.main()

diff --git a/snapper.spec.in b/snapper.spec.in
index c8e7a371137ac9e6ed0c7de1f551e6261bc99a2d..5f741bdd5c1f4ad79782d9ac7110780755ec1b9a 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -13,7 +13,7 @@ Source:               snapper-%{version}.tar.bz2
 Prefix:                /usr
 BuildRequires: gcc-c++ boost-devel blocxx-devel doxygen dejagnu libxml2-devel
 Requires:      libsnapper@LIBVERSION_MAJOR@ = %version
-Recommends:    cron logrotate
+Recommends:    cron logrotate snapper-zypp-plugin
 Summary:       Tool for filesystem snapshot management
 Url:           http://en.opensuse.org/Portal:Snapper
 
@@ -113,3 +113,20 @@ Authors:
 %{_libdir}/libsnapper.la
 %{_libdir}/libsnapper.so
 %{prefix}/include/snapper
+
+%package -n snapper-zypp-plugin
+Requires:      snapper zypp-plugin-python > 0.2
+Summary:       Plugin for zypp for calling snapper
+Group:         System/Packages
+
+%description -n snapper-zypp-plugin
+This package contains a plugin for zypp that makes snapshots with snapper
+during commits.
+
+Authors:
+--------
+    Arvin Schnell <aschnell@suse.de>
+
+%files -n snapper-zypp-plugin
+%defattr(-,root,root)
+/usr/lib/zypp/plugins/commit/snapper.py