[packages/swatch] Patch to partially fix 'echo' command

mmazur mmazur at pld-linux.org
Thu Feb 5 11:11:57 CET 2015


commit ea3fa1fa35544131de0578e5546f9f319e406187
Author: Mariusz Mazur <mmazur at axeos.com>
Date:   Thu Feb 5 10:11:38 2015 +0000

    Patch to partially fix 'echo' command
    
    Still leaves a broken terminal though.

 fix_echo.patch | 12 ++++++++++++
 swatch.spec    |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/swatch.spec b/swatch.spec
index 68795dd..b825eca 100644
--- a/swatch.spec
+++ b/swatch.spec
@@ -20,6 +20,7 @@ Source5:    swatch.sysconfig
 Source6:    swatch-service-generator
 Source7:    swatch.target
 Source8:    swatch at .service
+Patch0:     fix_echo.patch
 URL:		http://swatch.sourceforge.net/
 BuildRequires:	perl-base
 BuildRequires:	perl-devel
@@ -49,6 +50,7 @@ skryptu itp.) w zależności od zawartości logów.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL \
diff --git a/fix_echo.patch b/fix_echo.patch
new file mode 100644
index 0000000..0ef5923
--- /dev/null
+++ b/fix_echo.patch
@@ -0,0 +1,12 @@
+diff -urN swatch-3.2.3.orig/lib/Swatch/Actions.pm swatch-3.2.3/lib/Swatch/Actions.pm
+--- swatch-3.2.3.orig/lib/Swatch/Actions.pm	2006-05-02 21:17:42.000000000 +0000
++++ swatch-3.2.3/lib/Swatch/Actions.pm	2015-02-05 10:10:05.562036582 +0000
+@@ -62,7 +62,7 @@
+ 	     and $args{'THRESHOLDING'} eq 'on'
+ 	     and not &Swatch::Threshold::threshold(%args));
+   
+-  if (${$args{'MODES'}}[0] =~ /^normal$/i) { # for backward compatability
++  if (${$args{'MODES'}}[0] =~ /^normal$|^$/i) { # for backward compatability
+     print "$args{'MESSAGE'}\n";
+   } else {
+     print colored("$args{'MESSAGE'}\n", @{$args{'MODES'}});
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/swatch.git/commitdiff/ea3fa1fa35544131de0578e5546f9f319e406187



More information about the pld-cvs-commit mailing list