← Back to branch summary

~ubuntu-dev/ubuntu/lucid/quilt/lucid-201002101907

« back to all changes in this revision

Viewing changes to quilt/push.in

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Martin Quinson, Raphaël Hertzog, Ryan Niebur
  • Date: 2009-09-02 22:05:25 UTC
  • mfrom: (1.2.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090902220525-zhckxgbs9wqhyw83
https://launchpad.net/bugs/402237
http://bugs.debian.org/544668
[ Martin Quinson ]
* New upstream release.
* debian/patches/generic-awk: removed since merged upstream.
* debian/patches/*: updated so that they apply again on this release.

[ Raphaël Hertzog ]
* Remove Simon Hormans from Uploaders with his permission.
* debian/patches/fix-manpage-generation: fix Makefile so that
  the manual page is correctly generated with dash too (LP: #402237)
* Improve dh_quilt_patch/unpatch by respecting the QUILT_PATCH_DIR
  environment variable like /usr/share/quilt/quilt.make does.
  Closes: #544668

[ Ryan Niebur ]
* Add myself to Uploaders
* fixes to the arch_all patch to pass test suite
  - port upstream changes to the c version to the bash rewrite
    of backup-files
  - fix backup-files to process all files passed in on the
    command line instead of just the last (a clear bug)
* refresh all patches with -p ab
* add procmail to build deps, needed by tests
* Debian Policy 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
quilt/push.in
21
21
 
22
22
usage()
23
23
{
24
 
        printf $"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|auto|never]] [num|patch]\n"
 
24
        printf $"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] [num|patch]\n"
25
25
        if [ x$1 = x-h ]
26
26
        then
27
27
                printf $"
34
34
 
35
35
-a      Apply all patches in the series file.
36
36
 
37
 
-f      Force apply, even if the patch has rejects.
38
 
 
39
37
-q      Quiet operation.
40
38
 
 
39
-f      Force apply, even if the patch has rejects. Unless in quiet mode,
 
40
        apply the patch interactively: the patch utility may ask questions.
 
41
 
41
42
-v      Verbose operation.
42
43
 
43
44
--leave-rejects
44
45
        Leave around the reject files patch produced, even if the patch
45
46
        is not actually applied.
46
47
 
47
 
--interactive
48
 
        Allow the patch utility to ask how to deal with conflicts. If
49
 
        this option is not given, the -f option will be passed to the
50
 
        patch program.
51
 
 
52
48
--color[=always|auto|never]
53
49
        Use syntax coloring.
54
50
"
272
268
        fi
273
269
}
274
270
 
275
 
options=`getopt -o fqvah --long leave-rejects,interactive,color:: -- "$@"`
 
271
options=`getopt -o fqvah --long leave-rejects,color:: -- "$@"`
276
272
 
277
273
if [ $? -ne 0 ]
278
274
then
301
297
        --leave-rejects)
302
298
                opt_leave_rejects=1
303
299
                shift ;;
304
 
        --interactive)
305
 
                opt_interactive=1
306
 
                shift ;;
307
300
        --color)
308
301
                case "$2" in
309
302
                "" | always)
344
337
 
345
338
[ -n "$opt_quiet" ] && silent=-s
346
339
[ -z "$opt_verbose" ] && silent_unless_verbose=-s
347
 
[ -z "$opt_interactive" ] && force_apply=-f
 
340
[ -z "$opt_force" -o -n "$opt_quiet" ] && force_apply=-f
348
341
[ -n "$opt_force" ] && opt_leave_rejects=1
349
342
 
350
343
top=$(top_patch)