From fc9beda05f67ce8e101598ae8a7a3500e3e836e9 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 27 May 2010 11:58:35 -0400 Subject: [PATCH] Use the .. Perl operator to simplify prerms. invirt-console-host, invirt-dev, and all of the packages in xvm-munin-config previously used a convoluted one-liner to clean up /etc/sudoers, but we can do it much more easily using the .. operator. Taken from http://blog.ksplice.com/2010/05/top-10-perl-one-liner-tricks/ svn path=/trunk/packages/invirt-dev/; revision=3011 --- debian/changelog | 3 ++- debian/invirt-dev.prerm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ef804a..0cf4983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ invirt-dev (0.1.0) unstable; urgency=low * Since the prerm code to remove the repo group from sudoers runs on upgrades, make sure the postinst code to add it back runs on all upgrades, too. + * Use the .. Perl operator to simplify the prerm. - -- Evan Broder Thu, 17 Dec 2009 16:06:31 -0600 + -- Evan Broder Thu, 27 May 2010 11:55:06 -0400 invirt-dev (0.0.14) unstable; urgency=low diff --git a/debian/invirt-dev.prerm b/debian/invirt-dev.prerm index 80d7817..3a0d421 100755 --- a/debian/invirt-dev.prerm +++ b/debian/invirt-dev.prerm @@ -21,7 +21,7 @@ case "$1" in remove|upgrade|deconfigure) [ "$1" = "remove" ] && update-inetd --disable git - perl -i.bak -ne 's%^### (BEGIN|END) invirt-dev\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers + perl -i.bak -ne 'print unless /^### BEGIN invirt-dev/../^### END invirt-dev/' /etc/sudoers ;; failed-upgrade) -- 1.7.9.5