diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/apatch.in | 7 | ||||
-rwxr-xr-x | scripts/rpatch.in | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/apatch.in b/scripts/apatch.in index 11f3739..7e58c50 100755 --- a/scripts/apatch.in +++ b/scripts/apatch.in @@ -97,8 +97,11 @@ apatch() echo "$output" \ | @AWK@ ' /^patching file / { filename = substr($0, 15) } - { gsub(/-- saving rejects to file .*/, - "-- rejects in file " filename) } + { if ('${#silent}' != 0) + gsub(/ -- saving rejects to file .*/, "") + else + gsub(/ -- saving rejects to file .*/, " -- rejects in file " filename) + } { print } ' elif [ -n "$output" ] diff --git a/scripts/rpatch.in b/scripts/rpatch.in index 7d179d3..b33652a 100755 --- a/scripts/rpatch.in +++ b/scripts/rpatch.in @@ -122,7 +122,7 @@ rpatch() then printf $"Removing patch %s\n" "$(print_patch $patch)" rm -f "$QUILT_PC/$patch/.timestamp" - @LIB@/backup-files $silent -r -B $QUILT_PC/$patch/ - + @LIB@/backup-files $silent -r -t -B $QUILT_PC/$patch/ - status=$? remove_from_db $patch rm -f $QUILT_PC/$patch~refresh |