← Back to branch summary

~ubuntu-branches/ubuntu/maverick/quilt/maverick

« back to all changes in this revision

Viewing changes to quilt/push.in

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-01-14 22:23:25 UTC
  • mfrom: (6.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100114222325-22r8802djds2qykm
Tags: 0.48-4ubuntu1
https://launchpad.net/bugs/507662
https://launchpad.net/bugs/428657
* Merge from Debian unstable (LP: #507662), remaining changes:
  - debian/patches/check_series_is_no_dir: Check that series is not a
    directory (LP: #428657).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quilt/push.in
135
135
{
136
136
        local patch=$1
137
137
 
138
 
        $QUILT_LIB/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ -
 
138
        $QUILT_DIR/scripts/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ -
139
139
}
140
140
 
141
141
cleanup_patch_output() {
179
179
                no_reject_files="-r $tmp"
180
180
        fi
181
181
 
 
182
        if [ ! -e "$patch_file" -a -z "$opt_force" ]
 
183
        then
 
184
                printf $"Patch %s does not exist\n" \
 
185
                       "$(print_patch $patch)" >&2
 
186
                return 1
 
187
        fi
 
188
 
182
189
        apply_patch $patch "$patch_file"
183
190
        status=$?
184
191
        trap "" SIGINT
333
340
        [ -z "$opt_all" ] && number=1
334
341
fi
335
342
 
336
 
stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit 1
 
343
stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit $?
337
344
 
338
345
[ -n "$opt_quiet" ] && silent=-s
339
346
[ -z "$opt_verbose" ] && silent_unless_verbose=-s