[libconfig-model-lcdproc-perl] 07/09: patch tweak-lcdd-conf: warn and fix adapted from udev/lcd-imon (req C::M 2.059)

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-lcdproc-perl.

commit 45c8ec8c18e9efca27be7bf68fc79e3e28b66eda
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Jul 1 13:42:58 2014 +0200

    patch tweak-lcdd-conf: warn and fix adapted from udev/lcd-imon (req C::M 2.059)
    
    The requirement on C::M 2.059 avoids a crash when running cme fix lcdproc
    with a LCDd.conf configured with an imon device and no actual imon device.
---
 debian/patches/tweak-lcdd-conf | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/patches/tweak-lcdd-conf b/debian/patches/tweak-lcdd-conf
index 70cb0f5..30decd5 100644
--- a/debian/patches/tweak-lcdd-conf
+++ b/debian/patches/tweak-lcdd-conf
@@ -60,7 +60,7 @@ Author: dod
  User=nobody
  
  # The server will stay in the foreground if set to yes.
-@@ -662,6 +677,17 @@
+@@ -662,6 +677,21 @@
  [imon]
  
  # select the device to use
@@ -70,11 +70,15 @@ Author: dod
 +#     formula="my $l = '/dev/lcd-imon'; -e $l ? $l : '/dev/lcd0';"
 +#     use_eval=1
 +#     allow_override=1 -
-+#   warn_unless:device_file
-+#     code=" defined $_ ? -e : 1"
++#   warn_unless:use_lcd_imon
++#     code="my $l = '/dev/lcd-imon'; not -e $l or $_ eq $l ;"
++#     msg="imon device does not use /dev/lcd-imon link."
++#     fix="$_ = undef;" -
++#   warn_unless:found_device_file
++#     code="defined $_ ? -e : 1"
 +#     msg="missing imon device file"
-+#     fix="$_ = undef;"
-+#   - %}
++#     fix="$_ = undef;" -
++# %}
  Device=/dev/lcd0
  
  # display dimensions

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-lcdproc-perl.git