summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-09 13:13:26 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-09 13:13:26 -0500
commit2befad2bbbd46deab1594848a7b97def6d8e183f (patch)
treeb63252b860b610a98b0a115ca49c5ad2bf5912d5
parent4d41807cdc8a536bbd8d7540c81d44462a9758b6 (diff)
* Some initial rpm support. Patch from Евгений Терешков.
-rw-r--r--debian/changelog1
-rwxr-xr-xinit.d/50vcs-ignore4
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9afaaa4..0c718cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ etckeeper (0.11) UNRELEASED; urgency=low
* Add lvm cache dir to default ignores. (#462355)
* Updated German translation. Closes: #463153
+ * Some initial rpm support. Patch from Евгений Терешков.
-- Joey Hess <joeyh@debian.org> Thu, 24 Jan 2008 16:19:05 -0500
diff --git a/init.d/50vcs-ignore b/init.d/50vcs-ignore
index 134bc29..967d896 100755
--- a/init.d/50vcs-ignore
+++ b/init.d/50vcs-ignore
@@ -45,6 +45,10 @@ if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
comment "new and old versions of conffiles, stored by dpkg"
ignore "*.dpkg-*"
nl
+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "rpm" ]; then
+ comment "new and old versions of conffiles, stored by apt/rpm"
+ ignore "*.rpm*"
+ nl
elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" ]; then
comment "new and old versions of conffiles, stored by pacman"
ignore "*.pacnew"