[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [PATCH 12/39] backup-files: Simplify find loop
From: |
Jean Delvare |
Subject: |
[Quilt-dev] [PATCH 12/39] backup-files: Simplify find loop |
Date: |
Sat, 19 Mar 2011 10:52:42 +0100 |
User-agent: |
quilt/0.48-17.1 |
Let find report errors by itself.
Signed-off-by: Jean Delvare <address@hidden>
Reviewed-by: Raphael Hertzog <address@hidden>
---
quilt/scripts/backup-files.in | 15 +++------------
test/delete.test | 2 +-
2 files changed, 4 insertions(+), 13 deletions(-)
--- a/quilt/scripts/backup-files.in
+++ b/quilt/scripts/backup-files.in
@@ -193,21 +193,12 @@ while [ $I -lt address@hidden ]; do
case "${FILELIST[$I]}" in
-)
- find "$OPT_PREFIX" -mindepth 1 \( -type f -o -type d \) -print
2>/dev/null \
+ find "$OPT_PREFIX" -type f -print \
| while read
do
- if [ -d "$REPLY" ]
- then
- if ! [ -r "$REPLY" ] || ! [ -x "$REPLY" ]
- then
- echo "$REPLY: Permission denied"
- exit 1
- fi
- else
- process_file "${REPLY#$OPT_PREFIX}"
- fi
+ process_file "${REPLY#$OPT_PREFIX}"
done
- if [ $? != 0 ]; then
+ if [ ${PIPESTATUS[0]} != 0 ]; then
exit 1
fi
;;
--- a/test/delete.test
+++ b/test/delete.test
@@ -77,7 +77,7 @@ Test the delete command.
$ quilt delete "test3"
> Removing patch %{P}test3
- > .pc/test3/dir: Permission denied
+ >~ find: `?\.pc/test3/dir'?: Permission denied
$ chmod a+rx .pc/test3/dir
- [Quilt-dev] [PATCH 07/39] backup-files: Skip test for file presence, (continued)
- [Quilt-dev] [PATCH 07/39] backup-files: Skip test for file presence, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 18/39] backup-files: Make input methods mutually exclusive, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 25/39] backup-files: Separate function restore_all, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 26/39] backup-files: Quick exit when unlinking is not needed, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 13/39] backup-files: Split code to sparate functions, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 24/39] backup-files: Avoid negations, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 14/39] backup-files: Mass reindent, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 01/39] Make backup-files a shell script, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 22/39] backup-files: Check if backup exists, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 12/39] backup-files: Simplify find loop,
Jean Delvare <=
- [Quilt-dev] [PATCH 15/39] backup-files: Optimize restore, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 23/39] backup-files: Optimize noop, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 27/39] backup-files: Remember the list of files, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 17/39] backup-files: Drop variable filelist, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 09/39] backup-files: Inline copy_file and link_or_copy_file, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 19/39] backup-files: Use internal implementation of dirname, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 33/39] backup-files: Try mass copy first on copy, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 05/39] Clean up legacy C code, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 11/39] backup-files: Prefix must be a directory, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 30/39] backup-files: Skip first mkdir on restore, Jean Delvare, 2011/03/19