From cbcf21be2ee630c9e3b78e50e6184abbc08d1930 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Jun 2008 19:22:40 -0400 Subject: releasing version 0.16 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 661548a..0a7638a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -etckeeper (0.16) UNRELEASED; urgency=low +etckeeper (0.16) unstable; urgency=low * Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make it easy to configure etckeeper to abort an installation if there are uncommitted changes in /etc. Closes: #478754 - -- Joey Hess Sat, 07 Jun 2008 16:07:09 -0400 + -- Joey Hess Mon, 16 Jun 2008 19:21:16 -0400 etckeeper (0.15) unstable; urgency=low -- cgit v1.2.3 From bec75e8b10701f4142a1cdfe6c047a6dd1e5b2e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Jun 2008 20:37:56 -0400 Subject: Fix backwards test for AVOID_COMMIT_BEFORE_INSTALL. Closes: #486922 --- debian/changelog | 6 ++++++ pre-install.d/50uncommitted-changes | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0a7638a..207f6bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (0.17) unstable; urgency=low + + * Fix backwards test for AVOID_COMMIT_BEFORE_INSTALL. Closes: #486922 + + -- Joey Hess Wed, 18 Jun 2008 20:36:52 -0400 + etckeeper (0.16) unstable; urgency=low * Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make it diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index 465b06c..0d82419 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -10,7 +10,7 @@ if [ "$1" = "fail-debconf" ]; then fi if etckeeper unclean; then - if [ ! "$AVOID_COMMIT_BEFORE_INSTALL" ]; then + if [ "$AVOID_COMMIT_BEFORE_INSTALL" ]; then echo "error: etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 exit 1 fi -- cgit v1.2.3 From 8fbde8f8929f9c8476bdc1baca36d43a4f3ab510 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Jun 2008 20:39:56 -0400 Subject: releasing version 0.17 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 46d71ac..d0d12c4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.4~), python-support (>= 0.5.3) Maintainer: Joey Hess -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Git: git://git.kitenet.net/etckeeper Homepage: http://kitenet.net/~joey/code/etckeeper/ -- cgit v1.2.3 From 3262d47732044603b7b2e391a56c0874768c0fa0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 Jun 2008 16:59:17 -0400 Subject: make message clearer --- pre-install.d/50uncommitted-changes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index 0d82419..a5e69d4 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -11,7 +11,10 @@ fi if etckeeper unclean; then if [ "$AVOID_COMMIT_BEFORE_INSTALL" ]; then - echo "error: etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 + echo "" >&2 + echo "** etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 + echo "** Aborting $HIGHLEVEL_PACKAGE_MANAGER run. Manually commit and restart." >&2 + echo "" >&2 exit 1 fi if ! etckeeper commit "saving uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then -- cgit v1.2.3 From fd82d038ded28ec59fdb69bbd959b4031915273c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 29 Jun 2008 12:56:25 -0400 Subject: Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. --- debian/changelog | 6 ++++++ pre-install.d/50uncommitted-changes | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 207f6bc..638926f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (0.18) UNRELEASED; urgency=low + + * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. + + -- Joey Hess Sun, 29 Jun 2008 12:56:10 -0400 + etckeeper (0.17) unstable; urgency=low * Fix backwards test for AVOID_COMMIT_BEFORE_INSTALL. Closes: #486922 diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index a5e69d4..47750ac 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -10,7 +10,7 @@ if [ "$1" = "fail-debconf" ]; then fi if etckeeper unclean; then - if [ "$AVOID_COMMIT_BEFORE_INSTALL" ]; then + if [ "$AVOID_COMMIT_BEFORE_INSTALL" = 1 ]; then echo "" >&2 echo "** etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 echo "** Aborting $HIGHLEVEL_PACKAGE_MANAGER run. Manually commit and restart." >&2 -- cgit v1.2.3 From c61e40582a5016963ad8ed0b06cfee3d8cb66a34 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Jul 2008 18:35:39 -0400 Subject: update --- TODO | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TODO b/TODO index be807da..c2dbe7a 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,9 @@ Of coure, unless etckeeper is installed by debootstrap or thereabouts, you won't have a true pristine origin branch. + etcgit manages this, maybe steal its method? + git://git.debian.org/git/users/jo-guest/etcgit.git + * split the repo One way to split it would be to put private (non-world-readable) files -- cgit v1.2.3 From 682dca8fd09fd2fec335dc98f2cd4279c56f65b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 00:47:22 -0400 Subject: Don't allow LC_COLLATE to reorder the .etckeeper file. Closes: #489057 --- debian/changelog | 1 + pre-commit.d/30store-metadata | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 638926f..c4b65a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ etckeeper (0.18) UNRELEASED; urgency=low * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. + * Don't allow LC_COLLATE to reorder the .etckeeper file. Closes: #489057 -- Joey Hess Sun, 29 Jun 2008 12:56:10 -0400 diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata index bed2d89..243e019 100755 --- a/pre-commit.d/30store-metadata +++ b/pre-commit.d/30store-metadata @@ -1,7 +1,6 @@ #!/bin/sh set -e - # Filters out UNKNOWN users and groups, prints a warning on stderr. filter_unknown() { CMD=$1 @@ -15,7 +14,6 @@ filter_unknown() { done } - generate_metadata() { # This function generates the script commands to fix any files # that aren't owner=root, group=root, or mode=0644 or 0755. @@ -25,6 +23,10 @@ generate_metadata() { # but we want find to ignore the VCS files themselves. NOVCS='. -wholename ./.git -prune -o -wholename ./.bzr -prune -o -wholename ./.hg -prune -o' + # Keep the sort order the same at all times. + LC_COLLATE=C + export LC_COLLATE + if [ "$VCS" = git ] || [ "$VCS" = hg ]; then # These version control systems do not track directories, # so empty directories must be stored specially. @@ -52,7 +54,6 @@ generate_metadata() { # Maybe check for getfattr/setfattr and use them if they're available? } - if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then if [ -f .metadata ]; then # remove obsolete .metadata file -- cgit v1.2.3 From af657da3e4ee98342adc3bf0063b8f391292898f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 00:48:51 -0400 Subject: releasing version 0.18 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4b65a1..ab40971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -etckeeper (0.18) UNRELEASED; urgency=low +etckeeper (0.18) unstable; urgency=low * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. * Don't allow LC_COLLATE to reorder the .etckeeper file. Closes: #489057 - -- Joey Hess Sun, 29 Jun 2008 12:56:10 -0400 + -- Joey Hess Thu, 03 Jul 2008 00:47:40 -0400 etckeeper (0.17) unstable; urgency=low -- cgit v1.2.3 From 5b5070cd24bea4cb24ca75d56763ec80e0a9c46d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 5 Jul 2008 04:30:30 +0200 Subject: Use git ls-files instead of git-ls-files. git-ls-files won't be in PATH in the next Git version. Signed-off-by: Miklos Vajna --- unclean.d/50test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unclean.d/50test b/unclean.d/50test index 6829bec..f260f36 100755 --- a/unclean.d/50test +++ b/unclean.d/50test @@ -2,7 +2,7 @@ set -e if [ "$VCS" = git ]; then - [ -d .git ] && [ -n "`git-ls-files --modified --deleted --others --exclude-standard`" ] + [ -d .git ] && [ -n "`git ls-files --modified --deleted --others --exclude-standard`" ] elif [ "$VCS" = hg ]; then [ -d .hg ] && ! hg status 2>&1 | wc -l | grep -q "^0$" elif [ "$VCS" = bzr ]; then -- cgit v1.2.3 From 9fab4273a50b1ffe6c13d7e6ca9da0174ae27084 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 08:35:38 -0400 Subject: releasing version 0.19 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab40971..f638670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (0.19) unstable; urgency=low + + * Patch from Miklos Vajna to fix one more git- command that crept in. + + -- Joey Hess Sat, 05 Jul 2008 08:34:22 -0400 + etckeeper (0.18) unstable; urgency=low * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. -- cgit v1.2.3