You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2016/01/22 22:10:11 UTC
svn commit: r1726312 - in /uima/sandbox/uima-ducc/trunk/src/main/admin:
rm_qload rm_qoccupancy
Author: burn
Date: Fri Jan 22 21:10:11 2016
New Revision: 1726312
URL: http://svn.apache.org/viewvc?rev=1726312&view=rev
Log:
UIMA-4577 Fix usage check and ignore unprintable characters
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload
uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload?rev=1726312&r1=1726311&r2=1726312&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload Fri Jan 22 21:10:11 2016
@@ -105,7 +105,7 @@ class DuccRmQLoad(DuccUtil):
def main(self, argv):
- if ( argv == '-h' or argv == '-?' or argv == '--help' ):
+ if len(argv) > 0:
print 'rm_qload queries and formats the current state of the RM scheduling tables. It takes no parameters.'
sys.exit(1);
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy?rev=1726312&r1=1726311&r2=1726312&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy Fri Jan 22 21:10:11 2016
@@ -23,6 +23,8 @@ import os
import sys
import glob
import subprocess
+import string
+import binascii
from ducc_util import DuccUtil
@@ -78,8 +80,10 @@ class DuccRmQOccupancy(DuccUtil):
shares = {}
header = []
for l in lines:
- l = l.strip()
- # print '[]', l
+ # First character of first line may be 0x1B ESC
+ if len(l) > 0 and not l[0] in string.printable:
+ print 'Ignoring line', '[' + l + '] hex:', binascii.hexlify(l)
+ continue
if ( l == '' ):
continue
if ( '---' in l ):
@@ -113,8 +117,8 @@ class DuccRmQOccupancy(DuccUtil):
def main(self, argv):
- if ( argv == '-h' or argv == '-?' or argv == '--help' ):
- print 'rm_qload queries and formats the current state of the RM scheduling tables. It takes no parameters.'
+ if len(argv) > 0:
+ print 'rm_qoccupancy queries and formats the current state of the RM scheduling tables. It takes no parameters.'
sys.exit(1);
DH = self.DUCC_HOME