diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-02-01 18:08:49 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-02-01 18:08:49 +0100 |
| commit | d3d890aefb064de543f15746fad4dc7229034f7d (patch) | |
| tree | 9fbb858db369afb44448b6c2d1d29556b0ca75b9 | |
| parent | dcb1c1cdbe201c918543ed3be90a39af9b35dbcd (diff) | |
| download | quilt-d3d890aefb064de543f15746fad4dc7229034f7d.tar.gz | |
backup-files: Drop support for backup removal
Drop support for backup removal (option -x). Quilt doesn't use it.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Raphael Hertzog <hertzog@debian.org>
| -rw-r--r-- | quilt/scripts/backup-files.in | 16 | ||||
| -rw-r--r-- | test/backup-files.test | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/quilt/scripts/backup-files.in b/quilt/scripts/backup-files.in index dc79155..acca741 100644 --- a/quilt/scripts/backup-files.in +++ b/quilt/scripts/backup-files.in @@ -21,7 +21,7 @@ set -e # MA 02110-1301, USA. usage () { - echo "Usage: $0 -B prefix {-b|-r|-c|-x|-L} [-s] [-k] [-t] [-L] {-f {file|-}|-|file ...} + echo "Usage: $0 -B prefix {-b|-r|-c|-L} [-s] [-k] [-t] [-L] {-f {file|-}|-|file ...} Create or restore backup copies of a list of files. @@ -32,7 +32,6 @@ usage () { -b Create backup (preserve links) -r Restore the backup -c Create simple copy - -x Remove backup files and empty parent directories -L Ensure that source files have a link count of 1 Common options: @@ -186,17 +185,6 @@ restore_all() fi } -remove() -{ - local file=$1 - local backup=$OPT_PREFIX$file - - if [ -e "$backup" ]; then - rm "$backup" - fi - rmdir -p "${backup%/*}" 2> /dev/null || true -} - noop_nolinks() { local file=$1 @@ -283,8 +271,6 @@ while [ $# -gt 0 ]; do ;; -c) OPT_WHAT=copy ;; - -x) OPT_WHAT=remove - ;; -B) OPT_PREFIX=$2 shift ;; diff --git a/test/backup-files.test b/test/backup-files.test index 405341d..8cbfc1c 100644 --- a/test/backup-files.test +++ b/test/backup-files.test @@ -13,8 +13,8 @@ Unit test of the backup-files script. > 2 $ [ backup/foo -nt foo ] && echo "mtimes differ" - # Test remove - $ %{QUILT_DIR}/scripts/backup-files -B backup/ -x foo + $ %{QUILT_DIR}/scripts/backup-files -B backup/ -r foo + > Restoring foo $ ls -l foo | awk '{ print $2 }' > 1 |