diff -Nru etckeeper-0.54ubuntu1/debian/changelog etckeeper-0.55ubuntu1/debian/changelog --- etckeeper-0.54ubuntu1/debian/changelog 2011-06-06 06:01:10.000000000 -0700 +++ etckeeper-0.55ubuntu1/debian/changelog 2011-06-20 21:13:45.000000000 -0700 @@ -1,3 +1,27 @@ +etckeeper (0.55ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #800034) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - 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) + + -- Adam Gandelman Sun, 19 Jun 2011 23:22:12 +0100 + +etckeeper (0.55) unstable; urgency=low + + * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. + Closes: https://bugzilla.redhat.com/show_bug.cgi?id=709487 + Thanks, Thomas Moschny + * Avoid being noisy in post-install after automatic yum updates. + (Tuomo Soini) + * Ignore FHS violating prelink.cache and openvpn-status.log. + * Ignore *.LOCK files, as used by selinux policies. + * Add AVOID_SPECIAL_FILE_WARNING to config file, and set it in cron + job to avoid daily noise. (gulikoza) + + -- Joey Hess Sun, 19 Jun 2011 15:21:20 -0400 + etckeeper (0.54ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: diff -Nru etckeeper-0.54ubuntu1/debian/cron.daily etckeeper-0.55ubuntu1/debian/cron.daily --- etckeeper-0.54ubuntu1/debian/cron.daily 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/debian/cron.daily 2011-06-19 15:22:11.000000000 -0700 @@ -5,6 +5,8 @@ if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then # avoid autocommit if an install run is in progress if [ ! -e /var/cache/etckeeper/packagelist.pre-install ]; then + AVOID_SPECIAL_FILE_WARNING=1 + export AVOID_SPECIAL_FILE_WARNING if etckeeper unclean; then etckeeper commit "daily autocommit" >/dev/null fi diff -Nru etckeeper-0.54ubuntu1/etckeeper etckeeper-0.55ubuntu1/etckeeper --- etckeeper-0.54ubuntu1/etckeeper 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/etckeeper 2011-06-19 15:22:11.000000000 -0700 @@ -50,6 +50,9 @@ if [ ! -z "$AVOID_COMMIT_BEFORE_INSTALL" ]; then export AVOID_COMMIT_BEFORE_INSTALL fi +if [ ! -z "$AVOID_SPECIAL_FILE_WARNING" ]; then + export AVOID_SPECIAL_FILE_WARNING +fi if [ -z "$1" ]; then usage diff -Nru etckeeper-0.54ubuntu1/etckeeper.conf etckeeper-0.55ubuntu1/etckeeper.conf --- etckeeper-0.54ubuntu1/etckeeper.conf 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/etckeeper.conf 2011-06-19 15:22:11.000000000 -0700 @@ -20,6 +20,10 @@ # to /etc automatically once per day. #AVOID_DAILY_AUTOCOMMITS=1 +# Uncomment the following to avoid special file warning +# (the option is enabled automatically by cronjob regardless). +#AVOID_SPECIAL_FILE_WARNING=1 + # Uncomment to avoid etckeeper committing existing changes to # /etc before installation. It will cancel the installation, # so you can commit the changes by hand. diff -Nru etckeeper-0.54ubuntu1/etckeeper.spec etckeeper-0.55ubuntu1/etckeeper.spec --- etckeeper-0.54ubuntu1/etckeeper.spec 2011-06-06 06:01:14.000000000 -0700 +++ etckeeper-0.55ubuntu1/etckeeper.spec 2011-06-20 21:13:49.000000000 -0700 @@ -1,5 +1,5 @@ Name: etckeeper -Version: 0.54ubuntu1 +Version: 0.55ubuntu1 Release: 4%{?dist} Summary: store /etc in git, mercurial, bzr or darcs diff -Nru etckeeper-0.54ubuntu1/pre-commit.d/20warn-problem-files etckeeper-0.55ubuntu1/pre-commit.d/20warn-problem-files --- etckeeper-0.54ubuntu1/pre-commit.d/20warn-problem-files 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/pre-commit.d/20warn-problem-files 2011-06-19 15:22:11.000000000 -0700 @@ -18,11 +18,11 @@ special="" fi -if [ -n "$special" ]; then +if [ -n "$special" ] && [ -z "$AVOID_SPECIAL_FILE_WARNING" ]; then echo "etckeeper warning: special files could cause problems with $VCS:" >&2 echo "$special" >&2 fi -if [ -n "$hardlinks" ]; then +if [ -n "$hardlinks" ] && [ -z "$AVOID_SPECIAL_FILE_WARNING" ]; then echo "etckeeper warning: hardlinked files could cause problems with $VCS:" >&2 echo "$hardlinks" >&2 fi diff -Nru etckeeper-0.54ubuntu1/update-ignore.d/01update-ignore etckeeper-0.55ubuntu1/update-ignore.d/01update-ignore --- etckeeper-0.54ubuntu1/update-ignore.d/01update-ignore 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/update-ignore.d/01update-ignore 2011-06-19 15:22:11.000000000 -0700 @@ -118,9 +118,11 @@ comment "some other files in /etc that typically do not need to be tracked" ignore nologin ignore ld.so.cache + ignore prelink.cache ignore mtab ignore mtab.fuselock ignore .pwd.lock + ignore "*.LOCK" ignore network/run ignore adjtime ignore lvm/cache @@ -140,6 +142,7 @@ ignore "*.pyc" ignore "*.pyo" ignore "init.d/.depend.*" + ignore "openvpn/openvpn-status.log" nl comment "editor temp files" diff -Nru etckeeper-0.54ubuntu1/yum-etckeeper.py etckeeper-0.55ubuntu1/yum-etckeeper.py --- etckeeper-0.54ubuntu1/yum-etckeeper.py 2011-05-31 00:11:30.000000000 -0700 +++ etckeeper-0.55ubuntu1/yum-etckeeper.py 2011-06-19 15:22:11.000000000 -0700 @@ -18,7 +18,7 @@ from glob import fnmatch import yum -from yum.plugins import TYPE_CORE +from yum.plugins import PluginYumExit, TYPE_CORE requires_api_version = '2.1' plugin_type = (TYPE_CORE,) @@ -27,10 +27,12 @@ conduit.info(2, 'etckeeper: pre transaction commit') servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') command = '%s %s' % (servicecmd, " pre-install") - os.system(command) + ret = os.system(command) + if ret != 0: + raise PluginYumExit('etckeeper returned %d' % (ret >> 8)) def posttrans_hook(conduit): conduit.info(2, 'etckeeper: post transaction commit') servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') - command = '%s %s' % (servicecmd, "post-install") + command = '%s %s > /dev/null' % (servicecmd, "post-install") os.system(command)