org.handhelds.familiar/packages/quilt/files/wiggle.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- quilt/quilt/push.in~wiggle
   7 +++ quilt/quilt/push.in
   8 @@ -19,7 +19,7 @@
   9
  10  usage()
  11  {
  12 -       printf $"Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\n"
  13 +       printf $"Usage: quilt push [-afwqv] [--leave-rejects] [num|patch]\n"
  14         if [ x$1 = x-h ]
  15         then
  16                 printf $"
  17 @@ -34,6 +34,8 @@
  18
  19  -f     Force apply, even if the patch has rejects.
  20
  21 +-w     Use 'wiggle'.
  22 +
  23  -q     Quiet operation.
  24
  25  -v     Verbose operation.
  26 @@ -91,7 +93,7 @@
  27         fi
  28  }
  29
  30 -options=`getopt -o fqvah --long leave-rejects,interactive -- "$@"`
  31 +options=`getopt -o fwqvah --long leave-rejects,interactive -- "$@"`
  32
  33  if [ $? -ne 0 ]
  34  then
  35 @@ -106,6 +108,9 @@
  36          -f)
  37                  opt_force=1
  38                 shift ;;
  39 +       -w)
  40 +               opt_wiggle=1
  41 +               shift ;;
  42          -q)
  43                  opt_quiet=1
  44                 shift ;;
  45 @@ -152,6 +157,8 @@
  46
  47  [ -n "$opt_force" ] &&
  48         apatch_options="$apatch_options -f"
  49 +[ -n "$opt_wiggle" ] &&
  50 +       apatch_options="$apatch_options -w"
  51  [ -n "$opt_quiet" ] &&
  52         apatch_options="$apatch_options -q"
  53  [ -n "$opt_verbose" ] &&
  54 --- quilt/scripts/apatch.in~wiggle
  55 +++ quilt/scripts/apatch.in
  56 @@ -19,7 +19,7 @@
  57
  58  usage()
  59  {
  60 -       printf $"Usage: $0 [-fqv] patchname\n"
  61 +       printf $"Usage: $0 [-fwqv] patchname\n"
  62         exit 1
  63  }
  64
  65 @@ -91,7 +91,7 @@
  66
  67         trap "" SIGINT
  68
  69 -       if [ $status -ne 0 -a -z "$opt_leave_rejects" ]
  70 +       if [ $status -ne 0 -a -z "$opt_leave_rejects" -o -n "$opt_wiggle" ]
  71         then
  72                 # The reject files are removed in rollback_patch.
  73                 echo "$output" \
  74 @@ -109,6 +109,17 @@
  75                 echo "$output"
  76         fi
  77
  78 +       if [ -n "$opt_wiggle" ]; then
  79 +               rejects=`echo "$output" \
  80 +                        | sed -n -e \
  81 +                        '/-- saving rejects to file \(.\+\)\.rej/ { s/^.*-- saving rejects to file \(.\+\)\.rej/\1/; p }'`
  82 +               for rej in $rejects; do
  83 +                       # Kill old backup.. otherwise wiggle is very unhappy with you
  84 +                       rm -f $rej.porig
  85 +                       wiggle --replace $rej $rej.rej
  86 +               done
  87 +       fi
  88 +
  89         if [ $status -eq 0 -o -n "$opt_force" ]
  90         then
  91                 add_to_db $patch
  92 @@ -143,7 +154,7 @@
  93         return $status
  94  }
  95
  96 -options=`getopt -o fqvh --long leave-rejects,interactive -- "$@"`
  97 +options=`getopt -o fwqvh --long leave-rejects,interactive -- "$@"`
  98
  99  if [ $? -ne 0 ]
 100  then
 101 @@ -158,6 +169,9 @@
 102         -f)
 103                 opt_force=1
 104                 shift ;;
 105 +       -w)
 106 +               opt_wiggle=1
 107 +               shift ;;
 108         -q)
 109                 opt_quiet=1
 110                 shift ;;