[gentoo-commits] gentoo-x86 commit in sys-block/seekwatcher/files: seekwatcher-0.12_p20091015-dash-fix.patch

[gentoo-commits] gentoo-x86 commit in sys-block/seekwatcher/files: seekwatcher-0.12_p20091015-dash-fix.patch

[Sergei Trofimovich (slyfox)]

slyfox      12/03/09 18:48:42

  Added:                seekwatcher-0.12_p20091015-dash-fix.patch
  Log:
  Bump up to latest snapshot from upstream mercurial tree (latest release did not work). Approved by robbat2.
  
  (Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch?rev=1.1&content-type=text/plain

Index: seekwatcher-0.12_p20091015-dash-fix.patch
===================================================================
commit e594df5c73ab550fb76895f75f71109eb3640c41
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date:   Thu Feb 23 22:28:28 2012 +0300

    seekwatcher: fix failure when /bin/sh points to dash
    
    Before the patch:
    $ ./seekwatcher -t test.trace -o test.png -p 'sleep 5' -d /dev/sda2
    > using tracefile ./test.trace
    > sh: Syntax error: Bad fd number
    > Empty blktrace run found, exiting

Upstream status: sent, not applied yet
diff --git a/cmd/seekwatcher b/cmd/seekwatcher
index 7e96bd2..23cba1c 100755
--- a/cmd/seekwatcher
+++ b/cmd/seekwatcher
@@ -610,7 +610,7 @@ def run_blkparse(trace):
         print "using tracefile %s" % os.path.join(trace_dir, x)
         fh = tempfile.NamedTemporaryFile(dir=".")
         os.system('blkparse -q -D ' + trace_dir + ' -i ' + x +
-                ' -d ' + fh.name + ' -O >& /dev/null')
+                ' -d ' + fh.name + ' -O > /dev/null 2>&1')
         loaddata(fh, rd)
     return rd