diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2014-10-01 07:57:44 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-01-21 05:27:47 +0100 |
| commit | 926280cfc7da5aa6d8a4e7dc60f9831176758e7e (patch) | |
| tree | 4465c6d1d69d744af94fc4b80ad2da2b2db4ce16 /contrib/pacdiff.sh.in | |
| parent | a82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 (diff) | |
| download | pacman-926280cfc7da5aa6d8a4e7dc60f9831176758e7e.tar.gz pacman-926280cfc7da5aa6d8a4e7dc60f9831176758e7e.tar.xz | |
remove support for .pacorig files
Leave user files in place and save new config files with a .pacnew
extension. This reduces the complexity of file extraction and respects
the principle that pacman shouldn't modify files it didn't create.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to 'contrib/pacdiff.sh.in')
| -rw-r--r-- | contrib/pacdiff.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index ecb6ae29..3f0a3c69 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -1,5 +1,5 @@ #!/bin/bash -# pacdiff : a simple pacnew/pacorig/pacsave updater +# pacdiff : a simple pacnew/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com> # Copyright (c) 2013-2014 Pacman Development Team <pacman-dev@archlinux.org> @@ -35,7 +35,7 @@ usage() { cat <<EOF ${myname} (pacman) v${myver} -A simple program to merge or remove pacnew/pacorig/pacsave files. +A simple program to merge or remove pacnew/pacsave files. Usage: $myname [-l | -f | -p] [--nocolor] |