diff options
| -rw-r--r-- | etckeeper.conf | 2 | ||||
| -rwxr-xr-x | list-installed.d/50list-installed | 2 | ||||
| -rwxr-xr-x | update-ignore.d/01update-ignore | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/etckeeper.conf b/etckeeper.conf index 80609f4..639c77b 100644 --- a/etckeeper.conf +++ b/etckeeper.conf @@ -34,7 +34,7 @@ DARCS_COMMIT_OPTIONS="-a" HIGHLEVEL_PACKAGE_MANAGER=apt # The low-level package manager that's being used. -# (dpkg, rpm, pacman-g2, etc) +# (dpkg, rpm, pacman, pacman-g2, etc) LOWLEVEL_PACKAGE_MANAGER=dpkg # To push each commit to a remote, put the name of the remote here. diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed index f3f4eed..f392027 100755 --- a/list-installed.d/50list-installed +++ b/list-installed.d/50list-installed @@ -7,4 +7,6 @@ if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then egrep '(ok installed|ok config-files)' | cut -f2,3 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort +elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then + pacman -Q fi diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore index 7b2de72..2659aa6 100755 --- a/update-ignore.d/01update-ignore +++ b/update-ignore.d/01update-ignore @@ -93,7 +93,7 @@ writefile () { comment "new and old versions of conffiles, stored by apt/rpm" ignore "*.rpm*" nl - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" ]; then + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" ]; then comment "new and old versions of conffiles, stored by pacman" ignore "*.pacnew" ignore "*.pacorig" |