[kernel] r15165 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

Ben Hutchings benh at alioth.debian.org
Tue Feb 16 03:46:01 UTC 2010


Author: benh
Date: Tue Feb 16 03:45:59 2010
New Revision: 15165

Log:
templates: Remove more bogus //g modifiers

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Tue Feb 16 03:42:46 2010	(r15164)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Tue Feb 16 03:45:59 2010	(r15165)
@@ -72,30 +72,30 @@
       s/\#.*$//g;
       next if /^\s*$/;
 
-      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
-      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
-      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig;
-      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
-      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
-      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
-      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/ig;
-      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/ig;
-
-      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
-      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
-      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/ig;
-      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
-      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
-      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/ig;
-      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
+      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
+      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
+      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
+      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
+      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
+      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
+      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
+      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
+
+      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
+      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
+      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
+      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
+      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
+      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
+      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
 
-      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
+      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/i;
+      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/i;
     }
     close CONF;
   }

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Tue Feb 16 03:42:46 2010	(r15164)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Tue Feb 16 03:45:59 2010	(r15165)
@@ -50,29 +50,29 @@
       s/\#.*$//g;
       next if /^\s*$/;
 
-      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
-      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
-      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
-      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
-      $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/ig;
-      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/ig;
-      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/ig;
-
-      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
-      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
-      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
-      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/ig;
-      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
-
-      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
-      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
+      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
+      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
+      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
+      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
+      $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/i;
+      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
+      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
+
+      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
+      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
+      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
+      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
+      $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/i;
+      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
+      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
+
+      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/i;
+      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/i;
+      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/i;
     }
     close CONF;
   }

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Tue Feb 16 03:42:46 2010	(r15164)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Tue Feb 16 03:45:59 2010	(r15165)
@@ -81,33 +81,33 @@
       s/\#.*$//g;
       next if /^\s*$/;
 
-      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
-      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
-      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig;
-      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
-      $warn_reboot     = '' if /warn_reboot\s*=\s*(no|false|0)\s*$/ig;
-      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
-      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
-      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/ig;
-      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/ig;
-
-
-      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
-      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
-      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/ig;
-      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
-      $warn_reboot     = 'Yes' if /warn_reboot\s*=\s*(yes|true|1)\s*$/ig;
-      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
-      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/ig;
-      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
+      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
+      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
+      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
+      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
+      $warn_reboot     = '' if /warn_reboot\s*=\s*(no|false|0)\s*$/i;
+      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
+      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
+      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
+      $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
+
+
+      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
+      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
+      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
+      $warn_reboot     = 'Yes' if /warn_reboot\s*=\s*(yes|true|1)\s*$/i;
+      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
+      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
+      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
+      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
 
-      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
+      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/i;
+      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/i;
     }
     close CONF;
   }



More information about the Kernel-svn-changes mailing list