summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-11 18:17:19 -0400
committerJoey Hess <joey@kitenet.net>2010-09-11 18:17:19 -0400
commit577f128e85e886c66fe25ae5edf71bd47d9cdfd7 (patch)
treefed105f279398475e1338676b1940d1a53a4141b
parent08a94e65720e2e89219201b152677b0fcda27479 (diff)
Remove HOME setting in etckeeper. sudo now defaults to setting HOME itself as of version 1.7.4p4, so it is not necessary for etckeeper to work around its behavior anymore. (sudo also allows disabling that for those who enjoy using guns around feet.) Closes: #583899
-rw-r--r--debian/changelog4
-rw-r--r--debian/control1
-rwxr-xr-xetckeeper5
3 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index d2589ea..f38f6aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ etckeeper (0.49) UNRELEASED; urgency=low
that hook scripts that re-exec etckeeper are guaranteed to find it.
* Ignore -m switch to etckeeper commit, in case someone tries to use
it with that option common to several VCS. Closes: #592050
+ * Remove HOME setting in etckeeper. sudo now defaults to setting HOME
+ itself as of version 1.7.4p4, so it is not necessary for etckeeper
+ to work around its behavior anymore. (sudo also allows disabling that
+ for those who enjoy using guns around feet.) Closes: #583899
-- Joey Hess <joeyh@debian.org> Sun, 25 Jul 2010 19:44:37 -0400
diff --git a/debian/control b/debian/control
index 0c7d6dd..8c7a09f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Architecture: all
Section: admin
Depends: git-core (>= 1:1.5.4) | git (>= 1:1.7) | mercurial | bzr (>= 1.4~) | darcs, ${misc:Depends}
Recommends: cron
+Suggests: sudo (>= 1.7.4p4)
Conflicts: bzr (<< 1.4~)
XB-Python-Version: ${python:Versions}
Description: store /etc in git, mercurial, bzr or darcs
diff --git a/etckeeper b/etckeeper
index 2b2caee..483e16e 100755
--- a/etckeeper
+++ b/etckeeper
@@ -22,11 +22,6 @@ if [ -z "$VCS" ]; then
fi
export VCS
-# Workaround for sudo before 1.7.4p4 which left HOME pointing at user's
-# home directory
-HOME=~root
-export HOME
-
program_directory="${0%/*}"
if [ -n "$program_directory" ]; then
PATH="$PATH:$program_directory"