Merge lp:~jelmer/ubuntu/raring/etckeeper/merge-debian into lp:ubuntu/raring/etckeeper

[Jelmer Vernooij]

Merge the latest upstream version of etckeeper.

This also reverts (by not reapplying) the Ubuntu-specific change of the default VCS to Bazaar.

I've cherry-picked a patch from upstream to make it cope better with changes to the VCS setting. This fixes an issue originally introduced in dapper, when we first switched from git to bzr.

[Didier Roche-Tolomelli (didrocks)]

This looks good :) Not sure about the bzr -> git change back, but I trust your knowledge and your ubuntu friendlyness here :)

review: Approve

[Didier Roche-Tolomelli (didrocks)]

ah, it seems Colin actually already released 0.64ubuntu1

Unmerged revisions

45. By Jelmer Vernooij on 2012-12-28

releasing version 0.64ubuntu1

44. By Jelmer Vernooij on 2012-12-28

Drop hostname dependency.

43. By Jelmer Vernooij on 2012-12-28

Cherry-pick support for detecting the VCS in use from upstream.
(git commits e5742f7ae353f9a675e13fc0b951daeeff82bdae and
9f613899512e2091d2699c7f64b60c0dbdad71a2). LP: #909558

42. By Jelmer Vernooij on 2012-12-08

* Merge from Debian. Remaining changes:
 - etckeeper.spec: Change version to match Ubuntu version
 - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper
   is not installed from a tty (like early during installation)
 - debian/control: Added dependency on hostname.
 - etckeeper: Ensure that LANG is set, default to UTF8, necessary for
   bzr to function properly in non-interactive shells (eg, cron); user's
   local LANG will override if set.
* Drop patch to default to bzr as VCS, switching back to upstream default of
  git.
* Added support for openSUSE's zypper package manager.
  Thanks, Catalin Iacob
* Add Brazilian Portuguese debconf translation.
  Closes: #685771 Thanks, Adriano Rafael Gomes
* bzr: Improve detection of unclean repos, to work when there are shelved
  changes.
* uninit: Now preserves parts of the gitignore and similar files that
  are outside the managed by etckeeper block. Closes: #673996
  Thanks, David De La Harpe Golden (Squared Financial)
* Autocommit git staged files. Closes: #662614

=== modified file 'Makefile'
--- Makefile	2011-11-25 20:03:36 +0000
+++ Makefile	2012-12-28 17:58:21 +0000
@@ -36,6 +36,9 @@
 	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
 	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
 endif
+ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+	$(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+endif
 	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
 	echo "** installation successful"
 

=== modified file 'README'
--- README	2012-03-26 14:04:59 +0000
+++ README	2012-12-28 17:58:21 +0000
@@ -54,15 +54,15 @@
 Most VCS, including git, mercurial and bazaar have only limited tracking of
 file metadata, being able to track the executable bit, but not other
 permissions or owner info. (darcs doesn't even track executable bits.) So
-file metadata storage is stored separately. Among other chores, `etckeeper
-init` sets up a `pre-commit` hook that stores metadata about file owners
-and permissions into a `/etc/.metadata` file. This metadata is stored in
+file metadata is stored separately. Among other chores, `etckeeper init`
+sets up a `pre-commit` hook that stores metadata about file owners and
+permissions into a `/etc/.etckeeper` file. This metadata is stored in
 version control along with everything else, and can be applied if the repo
 should need to be checked back out.
 
 git and mercurial cannot track empty directories, but they can be
 significant sometimes in /etc. So the `pre-commit` hook also stores
-information that can be used to recreate the empty directories in a
+information that can be used to recreate the empty directories in the
 `/etc/.etckeeper` file.
 
 Most VCS don't support several special files that you _probably_ won't have
@@ -78,10 +78,10 @@
 
 A quick walkthrough of using etckeeper.
 
-Note that the default VCS is bzr, and this tutorial assumes you're using
+Note that the default VCS is git, and this tutorial assumes you're using
 it. Using other VCSes should be broadly similar. 
 
-The `etckeeper init` command initialises an /etc/.bzr/ repository. 
+The `etckeeper init` command initialises an /etc/.git/ repository. 
 If you installed etckeeper from a package, this was probably automatically
 performed during the package installation. If not, your first step is to
 run it by hand:
@@ -89,77 +89,81 @@
 	etckeeper init
 
 The `etckeeper init` command is careful to never overwrite existing files
-or directories in /etc. It will create a `.bzrignore` if one doesn't
+or directories in /etc. It will create a `.gitignore` if one doesn't
 already exist (or update content inside a "managed by etckeeper" comment
 block), sets up pre-commit hooks if they don't already exist, and so on. It
-does *not* commit any files, but does `bzr add` all interesting files for
+does *not* commit any files, but does `git add` all interesting files for
 an initial commit later.
 
-Now you might want to run `bzr status` to check that it includes all
+Now you might want to run `git status` to check that it includes all
 the right files, and none of the wrong files. And you can edit the
-`.bzrignore` and so forth. Once you're ready, it's time to commit:
+`.gitignore` and so forth. Once you're ready, it's time to commit:
 
 	cd /etc
-	bzr status
-	bzr commit -m "initial checkin"
+	git status
+	git commit -m "initial checkin"
+	git gc # pack git repo to save a lot of space
 
-After this first commit, you can use regular bzr commands to handle
+After this first commit, you can use regular git commands to handle
 further changes:
 
 	passwd someuser
-	bzr status
-	bzr commit -m "changed a password"
+	git status
+	git commit -a -m "changed a password"
 
 Rinse, lather, repeat. You might find that some files are changed by
-daemons and shouldn't be tracked by bzr. These can be removed from bzr:
+daemons and shouldn't be tracked by git. These can be removed from git:
 
-	bzr rm printcap # modified by CUPS
-	echo printcap >> .bzrignore
-	bzr commit -m "don't track printcap" 
+	git rm --cached printcap # modified by CUPS
+	echo printcap >> .gitignore
+	git commit -a -m "don't track printcap" 
 
 etckeeper hooks into apt (and similar systems) so changes to interesting
 files in /etc caused by installing or upgrading packages will automatically
 be committed. Here "interesting" means files that are not ignored by
-`.bzrignore`.
+`.gitignore`.
 
-You can use any bzr commands you like, but do keep in mind that, if you
-check out a different branch or an old version, bzr is operating directly
+You can use any git commands you like, but do keep in mind that, if you
+check out a different branch or an old version, git is operating directly
 on your system's /etc. If you do decide to check out a branch or tag,
 make sure you run "etckeeper init" again, to get any metadata changes:
 
-	bzr revert april_first_joke_etc
+	git checkout april_first_joke_etc
 	etckeeper init
 
 Often it's better to clone /etc to elsewhere and do potentially dangerous
-stuff in a staging directory. You can clone the repository using bzr branch,
+stuff in a staging directory. You can clone the repository using git clone,
 but be careful that the directory it's cloned into starts out mode 700, to
-prevent anyone else from seeing files like shadow, before `etckeeper init`
+prevent anyone else from seeing files like `shadow`, before `etckeeper init`
 fixes their permissions:
 
 	mkdir /my/workdir
 	cd /my/workdir
 	chmod 700 .
-	bzr branch /etc
+	git clone /etc
 	cd etc
 	etckeeper init -d .
 	chmod 755 ..
 
 Another common reason to clone the repository is to make a backup to a
-server. When using bzr push to create a new remote clone, make sure the new
-remote clone is mode 700! (And, obviously, only push over a secure
+server. When using `git push` to create a new remote clone, make sure the
+new remote clone is mode 700! (And, obviously, only push over a secure
 transport like ssh, and only to a server you trust.)
 
-	ssh server 'bzr init --no-tree /etc-clone; chmod -R 700 /etc-clone'
-	bzr push bzr+ssh://server/etc-clone
+	ssh server 'mkdir /etc-clone; cd /etc-clone; chmod 700 .; git init --bare'
+	git remote add backup ssh://server/etc-clone
+	git push backup --all
 
 If you have several machine's using etckeeper, you can start with a
 etckeeper repository on one machine, then add another machine's etckeeper
-repository. Then you can diff against it, examine its
+repository as a git remote. Then you can diff against it, examine its
 history, merge with it, and so on. It would probably not, however, be wise
-to "bzr checkout" the other machine's branch! (And if you do, make sure to
+to "git checkout" the other machine's branch! (And if you do, make sure to
 run "etckeeper init" to update file permissions.)
         
-	root@kodama:/etc>bzr diff -rbranch:bzr+ssh://dodo/etc | head
+	root@kodama:/etc>git remote add dodo ssh://dodo/etc
+	root@kodama:/etc>git fetch dodo
+	root@kodama:/etc>git diff dodo/master group |head
 	diff --git a/group b/group
 	index 0242b84..b5e4384 100644
 	--- a/group
@@ -171,6 +175,11 @@
 	-lp:x:7:cupsys
 	+lp:x:7:
 
+Incidentially, this also means I have a backup of dodo's /etc on kodama.
+So if kodama is compromised, that data could be used to attack dodo
+too. On the other hand, if dodo's disk dies, I can restore it from this
+handy hackup.
+
 Of course, it's also possible to pull changes from a server onto client
 machines, to deploy changes to /etc. Once /etc is under version control, the
 sky's the limit..
@@ -195,7 +204,7 @@
 	git commit -m "run git gc after each apt run"
 
 Here's how to disable the automatic commits after each apt run, while still
-letting it git add new files and git rm removed ones:
+letting it git add new files:
 
 	chmod -x /etc/etckeeper/commit.d/50vcs-commit
 
@@ -246,14 +255,12 @@
 * http://www.jukie.net/~bart/blog/20070312134706
 * http://bryan-murdock.blogspot.com/2007/07/put-etc-under-revision-control-with-git.html
 
-[isisetup][2] has some of the same aims as etckeeper, however, unlike it,
+isisetup had some of the same aims as etckeeper, however, unlike it,
 etckeeper does not aim to be a git porcelain with its own set of commands
 for manipulating the /etc repository. Instead, etckeeper provides a simple
 setup procedure and hooks for setting up an /etc repository, and then gets
 out of your way; you manage the repository using regular VCS commands.
 
-   [2]: http://www.isisetup.ch/
-
 
 ## license
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-26 15:10:42 +0000
+++ debian/changelog	2012-12-28 17:58:21 +0000
@@ -1,3 +1,45 @@
+etckeeper (0.64ubuntu1) raring; urgency=low
+
+  * Merge from Debian. Remaining changes:
+   - etckeeper.spec: Change version to match Ubuntu version
+   - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper
+     is not installed from a tty (like early during installation)
+   - etckeeper: Ensure that LANG is set, default to UTF8, necessary for
+     bzr to function properly in non-interactive shells (eg, cron); user's
+     local LANG will override if set.
+  * Drop patch to default to bzr as VCS, switching back to upstream default of
+    git.
+  * Cherry-pick support for detecting the VCS in use from upstream.
+    (git commits e5742f7ae353f9a675e13fc0b951daeeff82bdae and
+    9f613899512e2091d2699c7f64b60c0dbdad71a2). LP: #909558
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 08 Dec 2012 03:03:39 +0100
+
+etckeeper (0.64) unstable; urgency=low
+
+  * Added support for openSUSE's zypper package manager.
+    Thanks, Catalin Iacob
+  * Add Brazilian Portuguese debconf translation.
+    Closes: #685771 Thanks, Adriano Rafael Gomes
+
+ -- Joey Hess <[e-mail]>  Sat, 25 Aug 2012 11:53:08 -0400
+
+etckeeper (0.63) unstable; urgency=low
+
+  * bzr: Improve detection of unclean repos, to work when there are shelved
+    changes.
+  * uninit: Now preserves parts of the gitignore and similar files that
+    are outside the managed by etckeeper block. Closes: #673996
+    Thanks, David De La Harpe Golden (Squared Financial)
+
+ -- Joey Hess <[e-mail]>  Sat, 02 Jun 2012 18:22:37 -0400
+
+etckeeper (0.62) unstable; urgency=low
+
+  * Autocommit git staged files. Closes: #662614
+
+ -- Joey Hess <[e-mail]>  Mon, 05 Mar 2012 10:41:46 -0400
+
 etckeeper (0.61ubuntu2) precise; urgency=low
 
   * Update tutorial to use bzr. LP: #945453

=== modified file 'debian/control'
--- debian/control	2012-01-06 19:42:39 +0000
+++ debian/control	2012-12-28 17:58:21 +0000
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Joey Hess <[e-mail]>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 XS-Python-Version: all
 Vcs-Git: git://git.kitenet.net/etckeeper
 Homepage: http://kitenet.net/~joey/code/etckeeper/
@@ -12,7 +12,7 @@
 Package: etckeeper
 Architecture: all
 Section: admin
-Depends: bzr (>= 1.5~) | git (>= 1:1.7) | mercurial | darcs, hostname, ${misc:Depends}
+Depends: git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, ${misc:Depends}
 Recommends: cron
 Suggests: sudo (>= 1.7.4p4)
 Conflicts: bzr (<< 1.5~)

=== modified file 'debian/copyright'
--- debian/copyright	2011-02-06 00:00:55 +0000
+++ debian/copyright	2012-12-28 17:58:21 +0000
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: © 2007-2011 Joey Hess <[e-mail]>

=== added file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	1970-01-01 00:00:00 +0000
+++ debian/po/pt_BR.po	2012-12-28 17:58:21 +0000
@@ -0,0 +1,59 @@
+# Debconf translations for etckeeper.
+# Copyright (C) 2012 THE etckeeper'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the etckeeper package.
+# Adriano Rafael Gomes <[e-mail]>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper 0.63\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-05-06 14:41-0400\n"
+"PO-Revision-Date: 2012-08-21 11:15-0300\n"
+"Last-Translator: Adriano Rafael Gomes <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid "Commit failed"
+msgstr "Envio falhou"
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid "An attempt to commit /etc changes to ${VCS} failed."
+msgstr "Uma tentativa de enviar alterações feitas em /etc para ${VCS} falhou."
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Você pode resolver manualmente os problemas com as alterações não enviadas "
+"antes de continuar."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Remove etckeeper ${VCS} repository and associated files?"
+msgstr "Remover o repositório ${VCS} do etckeeper e os arquivos associados?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Etckeeper is being purged from the system, and was used to store /etc in a "
+"${VCS} repository. If you choose to remove the repository, this will DESTROY "
+"all history etckeeper has recorded for /etc."
+msgstr ""
+"O etckeeper está sendo expurgado do sistema, e foi usado para armazenar o "
+"diretório /etc em um repositório ${VCS}. Se você escolher remover o "
+"repositório, isso DESTRUIRÁ todo o histórico que o etckeeper gravou para o "
+"diretório /etc."

=== modified file 'etckeeper'
--- etckeeper	2012-02-06 07:49:28 +0000
+++ etckeeper	2012-12-28 17:58:21 +0000
@@ -16,12 +16,6 @@
 	. $conf
 fi
 
-if [ -z "$VCS" ]; then
-	echo "Please configure a VCS in $conf" >&2
-	exit 1
-fi
-export VCS
-
 program_directory="${0%/*}"
 if [ -n "$program_directory" ]; then
 	PATH="$PATH:$program_directory"
@@ -61,7 +55,7 @@
 if [ -z "$1" ]; then
 	usage
 elif [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ]; then
-	man etceeper || echo "Usage: etckeeper command [-d directory]" >&2
+	man etckeeper || echo "Usage: etckeeper command [-d directory]" >&2
 	exit 0
 fi
 command="$1"
@@ -94,6 +88,22 @@
 cd "$ETCKEEPER_DIR"
 export ETCKEEPER_DIR
 
+if [ -d ".git" ]; then
+	VCS=git
+elif [ -d ".hg" ]; then
+	VCS=hg
+elif [ -d "_darcs" ]; then
+	VCS=darcs
+elif [ -d ".bzr" ]; then
+	VCS=bzr
+fi
+
+if [ -z "$VCS" ]; then
+	echo "Please configure a VCS in $conf" >&2
+	exit 1
+fi
+export VCS
+
 lsscripts() {
 	perl -e '
 		$dir=shift;

=== modified file 'etckeeper.8'
--- etckeeper.8	2010-07-16 15:14:05 +0000
+++ etckeeper.8	2012-12-28 17:58:21 +0000
@@ -41,10 +41,11 @@
 .B unclean
 This returns true if the directory contains uncommitted changes.
 .TP
-.B update-ignore
+.B update-ignore [-a]
 This updates the VCS ignore file. Content outside a "managed by etckeeper"
 block is not touched. This is generally run when upgrading to a new version
-of etckeeper.
+of etckeeper. (The -a switch will add a "managed by etckeeper" block if
+one is not present.)
 .TP
 .B vcs subcommand [options ...]
 You can use this to run any subcommand of the VCS that etckeeper is

=== modified file 'etckeeper.conf'
--- etckeeper.conf	2011-06-21 17:14:20 +0000
+++ etckeeper.conf	2012-12-28 17:58:21 +0000
@@ -1,7 +1,7 @@
 # The VCS to use.
 #VCS="hg"
-#VCS="git"
-VCS="bzr"
+VCS="git"
+#VCS="bzr"
 #VCS="darcs"
 
 # Options passed to git commit when run by etckeeper.
@@ -30,7 +30,7 @@
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum etc)
+# (apt, pacman-g2, yum, zypper etc)
 HIGHLEVEL_PACKAGE_MANAGER=apt
 
 # The low-level package manager that's being used.

=== modified file 'etckeeper.spec'
--- etckeeper.spec	2012-03-26 15:10:42 +0000
+++ etckeeper.spec	2012-12-28 17:58:21 +0000
@@ -1,5 +1,5 @@
 Name: etckeeper
-Version: 0.61ubuntu2
+Version: 0.64ubuntu1
 Release: 4%{?dist}
 Summary: store /etc in git, mercurial, bzr or darcs
 

=== modified file 'init.d/50vcs-ignore'
--- init.d/50vcs-ignore	2009-02-14 01:21:22 +0000
+++ init.d/50vcs-ignore	2012-12-28 17:58:21 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
 
-etckeeper update-ignore || true
+etckeeper update-ignore -a || true

=== modified file 'unclean.d/50test'
--- unclean.d/50test	2009-02-12 17:13:23 +0000
+++ unclean.d/50test	2012-12-28 17:58:21 +0000
@@ -2,11 +2,11 @@
 set -e
 
 if [ "$VCS" = git ]; then
-	[ -d .git ] && [ -n "`git ls-files --modified --deleted --others --exclude-standard`" ]
+	[ -d .git ] && [ -n "`git status --porcelain`" ]
 elif [ "$VCS" = hg ]; then
 	[ -d .hg ] && ! hg status 2>&1 | wc -l | grep -q "^0$"
 elif [ "$VCS" = bzr ]; then
-	[ -d .bzr ] && ! bzr status 2>/dev/null | wc -l | grep -q "^0$"
+	[ -d .bzr ] && ! bzr version-info --custom --template="{clean}\n" | grep -q "^1$"
 elif [ "$VCS" = darcs ]; then
 	[ -d _darcs ] && darcs whatsnew -l >/dev/null
 fi

=== modified file 'uninit.d/01prompt'
--- uninit.d/01prompt	2009-05-06 14:52:30 +0000
+++ uninit.d/01prompt	2012-12-28 17:58:21 +0000
@@ -3,7 +3,7 @@
 
 if [ "$1" != "-f" ]; then
 	echo "** Warning: This will DESTROY all recorded history for $ETCKEEPER_DIR,"
-	echo "** including the $VCS repository and ignore file."
+	echo "** including the $VCS repository."
 	echo ""
 	printf "Are you sure you want to do this? [yN] "
 	read answer

=== modified file 'uninit.d/50vcs-uninit'
--- uninit.d/50vcs-uninit	2009-09-26 15:58:15 +0000
+++ uninit.d/50vcs-uninit	2012-12-28 17:58:21 +0000
@@ -18,7 +18,37 @@
 managed_by_etckeeper="managed by etckeeper"
 
 if ! grep -q "$managed_by_etckeeper" "$file"; then
-	echo "etckeeper: "$file" does not contain \"$managed_by_etckeeper\" comment; not removing"
+	exit 0
 else
-	rm -f $file
+	realfile="$file"
+	if [ -n "`type -p tempfile`" ]; then
+		tempfile="tempfile"
+	elif [ -n "`type -p mktemp`" ]; then
+		tempfile="mktemp"
+	else
+		echo "etckeeper warning: can't find tempfile or mktemp" >&2
+		exit 1
+	fi
+	file=$($tempfile)
+	otherentries=
+	skipping=
+	while read line; do
+		if echo "$line" | grep -q "$managed_by_etckeeper"; then
+			if [ ! "$skipping" ]; then
+				skipping=1
+			else
+				skipping=
+			fi
+		elif [ ! "$skipping" ]; then
+			echo "$line" >> "$file"
+			otherentries=1
+		fi
+	done <"$realfile"
+
+	if [ "$otherentries" ]; then
+		mv -f "$file" "$realfile"
+	else
+		rm -f "$file"
+		rm -f "$realfile"
+	fi
 fi

=== modified file 'update-ignore.d/01update-ignore'
--- update-ignore.d/01update-ignore	2012-01-06 19:23:42 +0000
+++ update-ignore.d/01update-ignore	2012-12-28 17:58:21 +0000
@@ -160,8 +160,14 @@
 
 if [ -e "$file" ]; then
 	if ! grep -q "$managed_by_etckeeper" "$file"; then
-		echo "etckeeper: "$file" does not contain \"$managed_by_etckeeper\" comment; not updating"
-		exit 1
+		if [ "$1" != "-a" ]; then
+			echo "etckeeper: "$file" does not contain \"$managed_by_etckeeper\" comment; not updating"
+			exit 1
+		else
+			echo "etckeeper: "$file" exists but does not contain \"$managed_by_etckeeper\" comment; updating"
+			writefile
+			exit 0
+		fi
 	fi
 	realfile="$file"
 	if [ -n "`type -p tempfile`" ]; then

=== added file 'zypper-etckeeper.py'
--- zypper-etckeeper.py	1970-01-01 00:00:00 +0000
+++ zypper-etckeeper.py	2012-12-28 17:58:21 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+import errno
+import subprocess
+import zypp_plugin
+
+
+def _call_etckeeper(install_arg):
+    # zypper interprets the plugin's stdout as described in
+    # http://doc.opensuse.org/projects/libzypp/HEAD/zypp-plugins.html so it's
+    # important that we don't write anything to it. We therefore redirect
+    # etckeeper's stdout to the plugin's stderr. Since zypper writes the
+    # stderr of plugins to its log file, etckeeper's stdout will go there as
+    # well.
+
+    subprocess.call(['etckeeper', install_arg], stdout=2)
+
+
+class EtckeeperPlugin(zypp_plugin.Plugin):
+    def PLUGINBEGIN(self, headers, body):
+        _call_etckeeper('pre-install')
+        self.ack()
+
+    def PLUGINEND(self, headers, body):
+        try:
+            _call_etckeeper('post-install')
+        except OSError as e:
+            # if etckeeper was just removed, executing it will fail with
+            # ENOENT
+            if e.errno != errno.ENOENT:
+                # reraise so that we don't hide other errors than etckeeper
+                # not existing
+                raise
+        self.ack()
+
+
+plugin = EtckeeperPlugin()
+plugin.main()