summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-10-01 07:57:44 +0200
committerAllan McRae <allan@archlinux.org>2015-01-21 05:27:47 +0100
commit926280cfc7da5aa6d8a4e7dc60f9831176758e7e (patch)
tree4465c6d1d69d744af94fc4b80ad2da2b2db4ce16 /contrib
parenta82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 (diff)
downloadpacman-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')
-rw-r--r--contrib/README2
-rw-r--r--contrib/pacdiff.sh.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/README b/contrib/README
index bcb4b853..befd3c1d 100644
--- a/contrib/README
+++ b/contrib/README
@@ -16,7 +16,7 @@ sync databases (for safety on rolling release distributions).
paccache - a flexible package cache cleaning utility that allows greater
control over which packages are removed.
-pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/.
+pacdiff - a simple pacnew/pacsave updater for /etc/.
paclist - list all packages installed from a given repository. Useful for
seeing which packages you may have installed from the testing repository,
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]