← Back to branch summary

~dannf/ubuntu/saucy/screen/lp1213278-from-debian

« back to all changes in this revision

Viewing changes to debian/patches/24option_parser.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-10-23 17:36:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20071023173630-6q4agogsxuzujhwd
Tags: 4.0.3-7ubuntu1
* Merge with Debian; remaining Ubuntu changes:
  - 07_norootpassword.dpatch: When locking a root-owned screen, check that
    root has a password set. If not, ask for an unlocking key. (LP#6760)
  - debian/preinst: Remove obsolete init script 'screen' on
    upgrades. The script is called 'screen-cleanup' in Debian and thus
    should be called the same in Ubuntu to avoid a permanent and pointless
    delta. This needs to be kept until after the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/24option_parser.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 24option_parser.dpatch by  <hesso@pool.math.tu-berlin.de>
 
3
##
 
4
## DP: This is not getopt() and we don't have two leading dashes, so
 
5
## DP: parse and match the long options in full.
 
6
 
 
7
@DPATCH@
 
8
--- screen-4.0.3.orig/screen.c  2007-08-09 18:14:50.000000000 +0200
 
9
+++ screen-4.0.3/screen.c       2007-08-09 18:15:57.000000000 +0200
 
10
@@ -619,6 +619,8 @@
 
11
                    }
 
12
                  break;
 
13
                case 'w':
 
14
+                 if (strcmp(ap+1, "ipe"))
 
15
+                   exit_with_usage(myname, "Unknown option %s", --ap);
 
16
                  lsflag = 1;
 
17
                  wipeflag = 1;
 
18
                  if (ac > 1 && !SockMatch)