Hello community, here is the log from the commit of package etckeeper for openSUSE:Factory checked in at 2018-09-17 14:26:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/etckeeper (Old) and /work/SRC/openSUSE:Factory/.etckeeper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "etckeeper" Mon Sep 17 14:26:15 2018 rev:6 rq:635865 version:1.18.8 Changes: -------- --- /work/SRC/openSUSE:Factory/etckeeper/etckeeper.changes 2017-11-03 16:31:21.661992418 +0100 +++ /work/SRC/openSUSE:Factory/.etckeeper.new/etckeeper.changes 2018-09-17 14:26:16.939790817 +0200 @@ -1,0 +2,14 @@ +Tue Sep 11 07:34:30 UTC 2018 - [email protected] + +- update to 1.18.8: + * Work around git commit's lack of robustness, by providing + reasonable default values for GIT_COMMITTER_EMAIL etc. + This was already done as part of the su/sudo handling, + and is now always done. + * Don't hardcode the master branch when pushing to PUSH_REMOTE. + Instead, let git push whatever branches it is configured to + push to that remote. +- Drop 0001-Remove-env-from-shebang-in-zypper-plugin.patch because + now in upstream. + +------------------------------------------------------------------- Old: ---- 0001-Remove-env-from-shebang-in-zypper-plugin.patch etckeeper-1.18.7.tar.gz New: ---- etckeeper-1.18.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etckeeper.spec ++++++ --- /var/tmp/diff_new_pack.AxeJ6G/_old 2018-09-17 14:26:17.311790495 +0200 +++ /var/tmp/diff_new_pack.AxeJ6G/_new 2018-09-17 14:26:17.311790495 +0200 @@ -2,7 +2,7 @@ # # spec file for package etckeeper # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Mitsutoshi NAKANO <[email protected]> # Copyright (c) 2013 Pascal Bleser <[email protected]> # @@ -23,16 +23,14 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: etckeeper -Version: 1.18.7 +Version: 1.18.8 Release: 0 Summary: Store /etc under Version Control -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Management Source: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM etckeeper-avoid-packagelist.patch gh#joeyh/etckeeper#17 [email protected] -- add AVOID_PACKAGELIST Patch0: etckeeper-avoid-packagelist.patch -# PATCH-FIX-UPSTREAM 0001-Remove-env-from-shebang-in-zypper-plugin.patch -Patch1: 0001-Remove-env-from-shebang-in-zypper-plugin.patch Url: http://etckeeper.branchable.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define LPM rpm @@ -112,7 +110,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %__perl -pi -e ' s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|; ++++++ etckeeper-1.18.7.tar.gz -> etckeeper-1.18.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/commit.d/50vcs-commit new/etckeeper-1.18.8/commit.d/50vcs-commit --- old/etckeeper-1.18.7/commit.d/50vcs-commit 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/commit.d/50vcs-commit 2018-06-05 22:04:03.000000000 +0200 @@ -41,9 +41,16 @@ fi if [ "$VCS" = git ] && [ -d .git ]; then + # When not su'd to root, still set environment variables, + # since git's own code to determine the author and committer + # has several edge cases where it fails and would prevent the + # commit. + if [ -z "$USER" ]; then + USER="$(whoami)" + fi if [ -n "$USER" ]; then # Use user.name and user.email from the gitconfig belonging - # to the user who became root. + # to USER. USER_HOME="$(getent passwd "$USER" | cut -d: -f6)" if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then if [ -z "$GIT_AUTHOR_NAME" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/commit.d/99push new/etckeeper-1.18.8/commit.d/99push --- old/etckeeper-1.18.7/commit.d/99push 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/commit.d/99push 2018-06-05 22:04:03.000000000 +0200 @@ -2,7 +2,7 @@ if [ -n "$PUSH_REMOTE" ]; then if [ "$VCS" = git ] && [ -d .git ]; then for REMOTE in $PUSH_REMOTE; do - git push "$REMOTE" master || true + git push "$REMOTE" || true done elif [ "$VCS" = hg ] && [ -d .hg ]; then for REMOTE in $PUSH_REMOTE; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/debian/changelog new/etckeeper-1.18.8/debian/changelog --- old/etckeeper-1.18.7/debian/changelog 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/debian/changelog 2018-06-05 22:04:03.000000000 +0200 @@ -1,3 +1,15 @@ +etckeeper (1.18.8) unstable; urgency=medium + + * Work around git commit's lack of robustness, by providing + reasonable default values for GIT_COMMITTER_EMAIL etc. + This was already done as part of the su/sudo handling, + and is now always done. + * Don't hardcode the master branch when pushing to PUSH_REMOTE. + Instead, let git push whatever branches it is configured to + push to that remote. + + -- Joey Hess <[email protected]> Tue, 05 Jun 2018 16:00:41 -0400 + etckeeper (1.18.7) unstable; urgency=medium * Added some unit tests. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/README.mdwn new/etckeeper-1.18.8/doc/README.mdwn --- old/etckeeper-1.18.7/doc/README.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/README.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -184,7 +184,7 @@ -lp:x:7:cupsys +lp:x:7: -Incidentially, this also means I have a backup of dodo's /etc on darkstar. +Incidentally, this also means I have a backup of dodo's /etc on darkstar. So if darkstar 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 backup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/forum/Composite___47___multi-step_changes/comment_1_a381633b6acebfc83ca68eaa1e181840._comment new/etckeeper-1.18.8/doc/forum/Composite___47___multi-step_changes/comment_1_a381633b6acebfc83ca68eaa1e181840._comment --- old/etckeeper-1.18.7/doc/forum/Composite___47___multi-step_changes/comment_1_a381633b6acebfc83ca68eaa1e181840._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/forum/Composite___47___multi-step_changes/comment_1_a381633b6acebfc83ca68eaa1e181840._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2018-05-08T15:59:07Z" + content=""" +One way to accomplish this is to `git branch -f transaction master` at the +start, and once all intermediate commits have been made (by etckeeper or by +you), run `git reset transaction; etckeeper commit "transaction +description"`. + +It's also sometimes handy to then generate a merge commit between the final +transaction commit and the last intermediate commit; then you have both +the transactions and all the intermediate steps accessible in git log; +the git history has a diamond shape. + +I'd be willing to consider patches along these lines.. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/forum/Composite___47___multi-step_changes.mdwn new/etckeeper-1.18.8/doc/forum/Composite___47___multi-step_changes.mdwn --- old/etckeeper-1.18.7/doc/forum/Composite___47___multi-step_changes.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/forum/Composite___47___multi-step_changes.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,32 @@ +I'd like to be able to `commit` a single change into etckeeper's VCS that reflected more than one `apt` action. + +As a developer I prefer to see commits representing a logically complete piece of work, +not something that requires follow-on commits before the system is back in a sane / consistent state. + +Consider the case of installing Sublime Text for Linux (** - see bottom), +there are several steps, all of which are parts of a single logical action that should be committed as one operation into git (or whatever VCS). + +* wget ... | apt-key add - +* apt-get install apt-transport-https +* create /etc/apt/sources.list.d/sublime-text.list +* apt-get update +* apt-get install sublime-text + +Ideally the work-flow would look like: + +* etckeeper begin-transaction +* wget ... | apt-key add - +* git add apt/trusted.gpg +* apt-get install apt-transport-https + # etckeeper WARNS about uncommitted changes / transaction still open + # (instead of aborting) +* create /etc/apt/sources.list.d/sublime-text.list +* git add apt/sources.list.d/sublime-text.list +* apt-get update + # etckeeper WARNS... +* apt-get install sublime-text + # etckeeper WARNS... +* etckeeper finish-transaction # commits to VCS + + +(*) https://www.sublimetext.com/docs/3/linux_repositories.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/forum.mdwn new/etckeeper-1.18.8/doc/forum.mdwn --- old/etckeeper-1.18.7/doc/forum.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/forum.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,15 @@ +This is a place to discuss using etckeeper, share tips and tricks, etc. +If you need help, advice, or anything, post about it here. + +[[!inline pages="forum/* and !*/Discussion" archive=yes rootpage=forum postformtext="Add a new thread titled:"]] + +I get this warning: + +etckeeper warning: hardlinked files could cause problems with git: +PackageKit/events/post-transaction.d/README +PackageKit/events/pre-transaction.d/README + +What kind of problems can happen? + +In my use case it is no problem if the hardlink gets lost and two individual files +are in the repo. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/index.mdwn new/etckeeper-1.18.8/doc/index.mdwn --- old/etckeeper-1.18.7/doc/index.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/index.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -17,7 +17,8 @@ [[!sidebar content=""" [[README]] -[[install]] -[[news]] -[[todo]] +[[Install]] +[[News]] +[[Todo]] +[[Forum]] """]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/install.mdwn new/etckeeper-1.18.8/doc/install.mdwn --- old/etckeeper-1.18.7/doc/install.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/install.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -1,5 +1,5 @@ etckeeper is available in git at `git://git.joeyh.name/etckeeper`, or -[in gitweb](http://git.joeyh.name/?p=etckeeper.git). +[in gitweb](https://git.joeyh.name/index.cgi/etckeeper.git). It's packaged in Debian, Ubuntu, Fedora, etc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/news/version_1.18.2.mdwn new/etckeeper-1.18.8/doc/news/version_1.18.2.mdwn --- old/etckeeper-1.18.7/doc/news/version_1.18.2.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/news/version_1.18.2.mdwn 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -etckeeper 1.18.2 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Use getent utility instead of perl. (Elan Ruusamäe) - * Initial FreeBSD support with pkgng plugin. (William Johansson) - * Fix README.md symlink in package (Sebastian Schmidt, Antoine Beaupré, - closes: #[791566](http://bugs.debian.org/791566)) - * Fix typo of GIT\_COMMITTER\_EMAIL."""]] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/news/version_1.18.7.mdwn new/etckeeper-1.18.8/doc/news/version_1.18.7.mdwn --- old/etckeeper-1.18.7/doc/news/version_1.18.7.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/news/version_1.18.7.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,8 @@ +etckeeper 1.18.7 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Added some unit tests. + Thanks, Henrik Riomar. + * etckeeper will work on systems that do not have perl installed. + (perl is still used when available as it's faster) + Thanks, William Johansson and radhus. + * Prevent LC\_ALL overriding the LC\_COLLATE used to sort metadata."""]] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Fix_warnings_on_netbsd/comment_1_03217ebec4076aa066df755c99ba92fd._comment new/etckeeper-1.18.8/doc/todo/Fix_warnings_on_netbsd/comment_1_03217ebec4076aa066df755c99ba92fd._comment --- old/etckeeper-1.18.7/doc/todo/Fix_warnings_on_netbsd/comment_1_03217ebec4076aa066df755c99ba92fd._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Fix_warnings_on_netbsd/comment_1_03217ebec4076aa066df755c99ba92fd._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://schmonz.livejournal.com/"; + subject="never added this patch" + date="2017-06-28T17:43:39Z" + content=""" +pkgsrc had been on a really old version (1.3!) until mid-May, when Nathan sent me these patches. I brought us up to 1.18.5.1, saw that this patch was unneeded, and applied just [[the other one|Truly-quiet when there's nothing to commit]]. Hoping for a 1.18.7 distfile to appear (maybe [here](https://packages.debian.org/stretch/etckeeper)?) so I can keep pkgsrc at the latest. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Fix_warnings_on_netbsd.mdwn new/etckeeper-1.18.8/doc/todo/Fix_warnings_on_netbsd.mdwn --- old/etckeeper-1.18.7/doc/todo/Fix_warnings_on_netbsd.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Fix_warnings_on_netbsd.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,47 @@ +I use etckeeper from [pkgsrc](http://pkgsrc.se/sysutils/etckeeper) on NetBSD with a nightly cron job, and it generates warnings each night: + +~~~ +dnsdomainname: not found +find: -not: unknown option +find: -not: unknown option +[master e4e5623] Daily autocommit + 5 files changed, 90 deletions(-) +...and so on... +~~~ + +I've traced the issue to not-quite-POSIX args to `find` in `pre-commit.d/20warn-problem-files`, made a patch, and Amitai (schmonz) has applied the patch to the pkgsrc version. I thought you might want to include it at the source: + +~~~ +diff --git a/etckeeper/pre-commit.d/20warn-problem-files b/etckeeper/pre-commit.d/20warn-problem-files +index f7c7580..f28d5ac 100755 +--- a/etckeeper/pre-commit.d/20warn-problem-files ++++ b/etckeeper/pre-commit.d/20warn-problem-files +@@ -6,14 +6,14 @@ exclude_internal () { + } + + if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then +- special=$(find . -not -type d -not -type f -not -type l | exclude_internal) || true +- hardlinks=$(find . -type f -not -links 1 | exclude_internal ) || true ++ special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true ++ hardlinks=$(find . -type f ! -links 1 | exclude_internal ) || true + elif [ "$VCS" = hg ]; then +- special=$(find . -not -type d -not -type f -not -type l | exclude_internal) || true +- hardlinks=$(find . -type f -not -links 1 -exec hg status {} \; | exclude_internal ) || true ++ special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true ++ hardlinks=$(find . -type f ! -links 1 -exec hg status {} \; | exclude_internal ) || true + elif [ "$VCS" = git ]; then +- special=$(find . -not -type d -not -type f -not -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true +- hardlinks=$(find . -type f -not -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true ++ special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true ++ hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true + else + special="" + fi +~~~ + +Thanks! + +> This change was already made to etckeeper back in 2014, there +> is no "-not" in the etckeeper source code anywhere now. +> I wonder why netbsd is apparently using such an out of date etckeeper. +> Anyway, [[done]] --[[Joey]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_1_9131efb9888659f72a55fc732c87a566._comment new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_1_9131efb9888659f72a55fc732c87a566._comment --- old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_1_9131efb9888659f72a55fc732c87a566._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_1_9131efb9888659f72a55fc732c87a566._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://roschacker.id.mail.ru/"; + subject="What dependencies we need?" + date="2017-07-15T13:09:41Z" + content=""" +python is NOT installed by default +nither perl + +but git is present +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_2_8524d920029e401175ab6d2fe1362cc5._comment new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_2_8524d920029e401175ab6d2fe1362cc5._comment --- old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_2_8524d920029e401175ab6d2fe1362cc5._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg/comment_2_8524d920029e401175ab6d2fe1362cc5._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,37 @@ +[[!comment format=mdwn + username="http://roschacker.id.mail.ru/"; + subject="make install" + date="2017-07-15T13:52:11Z" + content=""" +root@LEDE:~/etckeeper.branchable.com# make +sed -i~ \"s/Version:.*/Version: $(perl -e '$_=<>;m/\((.*?)(-.*)?\)/;print $1;'<debian/changelog)/\" etckeeper.spec +/bin/sh: perl: not found +rm -f etckeeper.spec~ +sed -i~ \"s/Version:.*/Version: $(perl -e '$_=<>;m/\((.*?)(-.*)?\)/;print $1;' <debian/changelog)\\"/\" etckeeper +/bin/sh: perl: not found +rm -f etckeeper~ +python ./etckeeper-bzr/__init__.py build || echo \"** bzr support not built\" +Traceback (most recent call last): + File \"./etckeeper-bzr/__init__.py\", line 6, in <module> + from bzrlib.errors import BzrError +ImportError: No module named bzrlib.errors +** bzr support not built +python ./etckeeper-dnf/etckeeper.py build || echo \"** DNF support not built\" +Traceback (most recent call last): + File \"./etckeeper-dnf/etckeeper.py\", line 10, in <module> + from dnfpluginscore import logger +ImportError: No module named dnfpluginscore +** DNF support not built +root@LEDE:~/etckeeper.branchable.com# +root@LEDE:~/etckeeper.branchable.com# +root@LEDE:~/etckeeper.branchable.com# make install +sed -i~ \"s/Version:.*/Version: $(perl -e '$_=<>;m/\((.*?)(-.*)?\)/;print $1;' <debian/changelog)\\"/\" etckeeper +/bin/sh: perl: not found +rm -f etckeeper~ +mkdir -p /etc/etckeeper/ /var/cache/etckeeper/ +cp -R *.d /etc/etckeeper/ +install daily /etc/etckeeper/daily +make: install: Command not found +make: *** [Makefile:29: install] Error 127 +root@LEDE:~/etckeeper.branchable.com# +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg.mdwn new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg.mdwn --- old/etckeeper-1.18.7/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Porting_to_LEDE___40__OpenWRT__41___opkg.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,5 @@ +Hello + +What we need to do (to code) +for working etckeeper under LEDE/OpenWRT? + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout/comment_1_5fc68808d70b67dc66637864c10cfcff._comment new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout/comment_1_5fc68808d70b67dc66637864c10cfcff._comment --- old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout/comment_1_5fc68808d70b67dc66637864c10cfcff._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout/comment_1_5fc68808d70b67dc66637864c10cfcff._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-10-28T14:44:55Z" + content=""" +Such a post-checkout hook makes sense, and yes, `etckeeper init` only +restores file permissions when run in an existing repository. + +Do note that there's a window where files that are supposed to be private +may be exposed, depending on your umask, before the permissions are fixed +up. So I can't completely recommend doing this. It might be good to make +it install a post-checkout hook that both fixes the permissions and warns +that what the user is doing is not entirely safe. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout/comment_2_b862ace5417cdac371fe0d53bdcf4a2f._comment new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout/comment_2_b862ace5417cdac371fe0d53bdcf4a2f._comment --- old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout/comment_2_b862ace5417cdac371fe0d53bdcf4a2f._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout/comment_2_b862ace5417cdac371fe0d53bdcf4a2f._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="max@ef057623bb9d28c59f71a915db505de5795c9d25" + nickname="max" + avatar="http://cdn.libravatar.org/avatar/359dbffc8765406159ef904eedde50be"; + subject="comment 2" + date="2017-10-31T02:44:29Z" + content=""" +Okay, thanks for your reply! Actually my umask is more restrictive than the default, so privacy is not an issue here (Systemd bizarrely complains about files being too restricted...) +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout.mdwn new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout.mdwn --- old/etckeeper-1.18.7/doc/todo/Restore_metadata_at_checkout.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Restore_metadata_at_checkout.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,14 @@ +Every time I switch a branch and files get replaced, they are not in the chmod they should be (because of my umask). So I've added a post-checkout hook "etckeeper init". + +Do I understand it right, that this doesn't do anything but setting the file permissions correctly, as per .etckeeper file? + +Saving metadata i.e. file permissions is the primary reason using etckeeper instead of plain git. What would speak against setting that up by default? + + +--- +/etc/.git/hooks/post-checkout: + + #!/bin/sh + # post-checkout hook for etckeeper, to restore metadata + set -e + etckeeper init -d /etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_1_22aeb26fb522fb0806a2791970369080._comment new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_1_22aeb26fb522fb0806a2791970369080._comment --- old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_1_22aeb26fb522fb0806a2791970369080._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_1_22aeb26fb522fb0806a2791970369080._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-06-28T16:33:30Z" + content=""" +That patch makes etckeeper only commit changes that have been +staged (eg added with `git add`). If a file has been changed, +but not staged, `git diff --cached` will ignore the change, +and it won't get committed. So the patch is broken. + +On debian, a daily cron job uses `etckeeper unclean` to determine if there +are any changes in need of committing. That works with every VCS that +etckeeper supports, and my suggestion is that netbsd use the same +mechanism. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_2_21482b7d984aabd310c09539f1dc8f0b._comment new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_2_21482b7d984aabd310c09539f1dc8f0b._comment --- old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_2_21482b7d984aabd310c09539f1dc8f0b._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_2_21482b7d984aabd310c09539f1dc8f0b._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="truist" + avatar="http://cdn.libravatar.org/avatar/cbb99b0a9724faf8fc7f4464b7bfab11"; + subject="comment 2" + date="2017-06-29T16:17:33Z" + content=""" +Wow - I'm not sure how I missed that behavior. Sorry about that. And yes, it sounds like `etckeeper unclean` is a much better option. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_3_d88dfbf82994d484a50a8fb751fc4c83._comment new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_3_d88dfbf82994d484a50a8fb751fc4c83._comment --- old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_3_d88dfbf82994d484a50a8fb751fc4c83._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit/comment_3_d88dfbf82994d484a50a8fb751fc4c83._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="truist" + avatar="http://cdn.libravatar.org/avatar/cbb99b0a9724faf8fc7f4464b7bfab11"; + subject="comment 3" + date="2017-06-29T16:30:56Z" + content=""" +I see why I used `--cached` - because `30git-add` runs before this script, so the files to be added are always already cached by the time this script runs. Doing the diff without `--cached` wouldn't work. + +However, your solution is still better, in case users have customized the scripts. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit.mdwn new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit.mdwn --- old/etckeeper-1.18.7/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/Truly-quiet_when_there__39__s_nothing_to_commit.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,34 @@ +I use etckeeper from [pkgsrc](http://pkgsrc.se/sysutils/etckeeper) on NetBSD in a nightly cron job. My configuration for git includes `-q` but that isn't enough to fully silence it when there's nothing to commit, so I get an email from cron every night, even when there's nothing to commit. Amitai (schmonz) applied this patch to pkgsrc, and I thought you might like it upstream. + +Note that the patch will always skip attempting the commit, if there is nothing to commit, which is maybe not what you intended. But it's the only way to actually get silent nightlies. If you wanted to preserve backwards compatibility, it would be tricky, I think. + +There are also more-efficient ways to do this; the `diff` could be run right at the top of this script, and the rest of it skipped. But I wanted to be minimally-invasive, so I did it this way. + +~~~ +diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit +index 2a2176a..bcd02df 100755 +--- a/etckeeper/commit.d/50vcs-commit ++++ b/etckeeper/commit.d/50vcs-commit +@@ -87,10 +87,12 @@ if [ "$VCS" = git ] && [ -d .git ]; then + export GIT_COMMITTER_EMAIL + fi + fi +- if [ -n "$logfile" ]; then +- git commit $GIT_COMMIT_OPTIONS -F "$logfile" +- else +- git commit $GIT_COMMIT_OPTIONS ++ if ! git diff --cached --quiet; then ++ if [ -n "$logfile" ]; then ++ git commit $GIT_COMMIT_OPTIONS -F "$logfile" ++ else ++ git commit $GIT_COMMIT_OPTIONS ++ fi + fi + elif [ "$VCS" = hg ] && [ -d .hg ]; then + if [ -n "$USER" ]; then +~~~ + +Thank you! + +> [[closed|done]] because `etckeeper unclean` is a better way to do this. +> --[[Joey]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/decide_what_to_do_about_the_debian_patches.mdwn new/etckeeper-1.18.8/doc/todo/decide_what_to_do_about_the_debian_patches.mdwn --- old/etckeeper-1.18.7/doc/todo/decide_what_to_do_about_the_debian_patches.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/decide_what_to_do_about_the_debian_patches.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,76 @@ +There is a number of patches in the Debian BTS that has been pending +since before I took over maintainership of the package. I am wondering +what to do with them - a bunch seem relevant and I could bundle them +in `debian/patches` but I am not sure I want to carry such a "fork" of +etckeeper forever, so I would prefer to approve them here first. + +On the other hand, I do not want to flood you with 8 feature requests +you have already seen. So I figured I would open a single todo item to +quickly allow you to review the [patch set](https://bugs.debian.org/cgi-bin/pkgreport.cgi?include=tags%3Apatch&exclude=tags%3Apending&pend-exc=done&repeatmerged=no&src=etckeeper): + + * #519420 etckeeper: Add option to force commit after apt run. + + Hack to force an empty commit to keep track of package changes. + + Last change: Apr 2009. Marked "wontfix" in 2014. + + * #549354 etckeeper: don't warn about ignored files + + git-specific patch available, not sure how it behaves with other + VCSes. seems to have at least another user (fmarier) + + Last change: Oct 2010. + + * #576915 30store-metadata: use GNUisms to achieve 1s runtime. + + concerns about portability to solaris, is this still an issue? + + Last change: Apr 2010. + + * #592158 etckeeper: Example for tracking installed packages + + sample post-install hook to keep track of installed packages in + /etc. similar to #519420 - close? + + Last change: Aug 2010 + + * #612029 etckeeper: Example hook for generating GPG-encrypted bundle + after every commit + + another sample post-install hook to secretely ship a git bundle to + a backup server + + Last change: Feb 2011 + + * #613278 etckeeper: writing a commit message for the autocommit that + happens after apt + + patch for git, with possible patch for bzr as well, requiring + proposed upstream change for bzr, not merged. + + last change: Sep 2013 + + * #698062 logout hook + + yet *another* sample hook, by yours truly, add a new "logout" + subcommand that can be added to bash_logout scripts. + + last change: Jan 2013 + + * #777612 etckeeper should read XDG_CONFIG_HOME/git/config + + look in standard locations for the git config, seems sound + + last change: Feb 2015 + +So to simplify, there are those groups of proposed changes: + + * sample hooks (592158, 612029, 698062) + * bugfixes (549354, 777612) + * features and improvements (519420, 576915, 613278) + +So any opinion about what to do with those? Should I submit them as +separate issues? Or should I ask the original reporters to do that +here? Or should I just close those issues? + +Thanks! -- [[anarcat]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn new/etckeeper-1.18.8/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn --- old/etckeeper-1.18.7/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -3,7 +3,7 @@ I have configured etckeeper to use git. It works fine if I use apt-get or synaptic packet manager. -But when the update-manger install new packet versions it ends with an "installation failed" message. When I check the status of the git repository in the etc directory, some changes are not commited, e.g.: +But when the update-manger install new packet versions it ends with an "installation failed" message. When I check the status of the git repository in the etc directory, some changes are not committed, e.g.: On branch master Changes to be committed: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/etkeeper_warning_about_hardlinks_doesn__39__t_exclude_ignored_files.mdwn new/etckeeper-1.18.8/doc/todo/etkeeper_warning_about_hardlinks_doesn__39__t_exclude_ignored_files.mdwn --- old/etckeeper-1.18.7/doc/todo/etkeeper_warning_about_hardlinks_doesn__39__t_exclude_ignored_files.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/etkeeper_warning_about_hardlinks_doesn__39__t_exclude_ignored_files.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,16 @@ +Etckeeper checks for possible hardlinks in the file `/etc/etckeeper/pre-commit.d/20warn-problem-files` + +but it doesn't seem to exclude the files that match the ".gitignore" directives. + +Tested: + + # cat .gitignore | grep -i py + *.pyc + *.pyo + + + 15:12 root@someserver:/etc/fail2ban/action.d + # ls -l smtp.pyc + -rw-r--r-- 2 root root 5921 Jul 13 2017 smtp.pyc + +It would be better, for monitoring reasons, to exclude all those files that fall in the .gitignore pattern, as they won't be tracked anyway. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/push_remote_branch.mdwn new/etckeeper-1.18.8/doc/todo/push_remote_branch.mdwn --- old/etckeeper-1.18.7/doc/todo/push_remote_branch.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/todo/push_remote_branch.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -9,4 +9,8 @@ remove it, and add to the readme an example of writing your own `/etc/etckeeper/commit.d/99push` script that does exactly the kind of pushing you want. The only reason I've not done so is it would break -compatability for anyone using this feature. --[[Joey]] +compatibility for anyone using this feature. --[[Joey]] + +> Well, there was no point in it hardcoding master. `git push origin` will +> push whatever branches you've configured git to push. So, made that +> change, which I think is sufficient. [[done]] --[[Joey]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment new/etckeeper-1.18.8/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment --- old/etckeeper-1.18.7/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,26 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-06-08T17:00:19Z" + content=""" +What actually requires user.email be set under +undocumented circumstances? git does. Personally, I feel this is a total +misfeature on git's part; git commit should succeed under all +configuraations. Every single program that automates `git commit` +is potentially buggy otherwise. + +Anyway, yes, setting `USER=$(id -un)` (or whoami) would make +the code that currently is used to handle sudo users be always +run, and so git and any other VCSs that break in unusual circumstances +would always work (at least as far as username and email goes, who knows +what other requirements VCSs may have). + +The downside is that this could change etckeeper's behavior, since +it would now be guessing at the user name and email, and may make +different choices than git does. + +Setting USER would also impact the code for other VCSs than git. For +example, the code for hg always sets HGUSER when USER is set. I don't know +if the others VCSs are as picky as git; if this kind of breakage is not a +problem for them it might be best to only set USER when using git. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn new/etckeeper-1.18.8/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn --- old/etckeeper-1.18.7/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -34,3 +34,5 @@ IMO, considering how to document this behaviour shows it to be user-unfriendly. Therefore, it would be simplest if etckeeper could fall back to using `$(id -un)`, once `$(tty)` fails. + +> Set `USER=$(whoami)`, for git only. [[done]] --[[Joey]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6/comment_1_f5187936924ab40a8298d6103ddd683b._comment new/etckeeper-1.18.8/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6/comment_1_f5187936924ab40a8298d6103ddd683b._comment --- old/etckeeper-1.18.7/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6/comment_1_f5187936924ab40a8298d6103ddd683b._comment 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6/comment_1_f5187936924ab40a8298d6103ddd683b._comment 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2018-05-17T18:44:54Z" + content=""" +That is not an error message produced by etckeeper, you'll need to talk to +whoever produced the rpm of etckeeper that you have installed. +"""]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6.mdwn new/etckeeper-1.18.8/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6.mdwn --- old/etckeeper-1.18.7/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ new/etckeeper-1.18.8/doc/todo/updaiting_error:_etckeeper.noarch_0:1.18.7-2.el6.mdwn 2018-06-05 22:04:03.000000000 +0200 @@ -0,0 +1,10 @@ +I have installed version: 1.18.5 +Trying to update: yum update from epel. + +getting error: + +Error: Package: etckeeper-1.18.7-2.el6.noarch (epel) + Requires: hostname + + +OS version: CentOS release 6.9 (Final) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/etckeeper new/etckeeper-1.18.8/etckeeper --- old/etckeeper-1.18.7/etckeeper 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/etckeeper 2018-06-05 22:04:03.000000000 +0200 @@ -71,7 +71,7 @@ exit 0 elif [ "x$1" = "x-v" ] || [ "x$1" = "x--version" ]; then # This is automatically updated by the Makefile. - echo "Version: 1.18.7" + echo "Version: 1.18.8" exit 0 fi command="$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/etckeeper.spec new/etckeeper-1.18.8/etckeeper.spec --- old/etckeeper-1.18.7/etckeeper.spec 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/etckeeper.spec 2018-06-05 22:04:03.000000000 +0200 @@ -1,5 +1,5 @@ Name: etckeeper -Version: 1.18.7 +Vaersion: 1.18.7 Release: 4%{?dist} Summary: store /etc in git, mercurial, bzr or darcs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etckeeper-1.18.7/zypper-etckeeper.py new/etckeeper-1.18.8/zypper-etckeeper.py --- old/etckeeper-1.18.7/zypper-etckeeper.py 2017-06-08 18:59:32.000000000 +0200 +++ new/etckeeper-1.18.8/zypper-etckeeper.py 2018-06-05 22:04:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python import errno import subprocess
