Commit f9b2d7f9 authored by Bas Zoetekouw's avatar Bas Zoetekouw

Forwarded patches upstream

parent fb9ec1fa
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: man page lintianisation: hyphen-used-as-minus-sign
......
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: "maketitle" insert build date to the document; re-insert original date.
......
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: reduce number of `rsvg-convert` processes to save RAM.
Default 8 may consume ~3...4 GiB and force extensive swapping...
......
Description: Make python script python3-compatible
Author: Bas Zoetekouw <bas@debian.org>
Origin: other, automatically generated by 2to3
Forwarded: yes, 2018-05-20
Last-Update: 2018-05-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
......@@ -15,13 +16,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -38,6 +38,7 @@
To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt.
"""
+from __future__ import print_function
import getopt, glob, os, sys, tempfile
verbose = 0
@@ -60,14 +61,14 @@
try:
(opts, args) = getopt.getopt(in_args, s_opts, l_opts)
- except getopt.error, msg:
......@@ -31,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ print(msg, file=sys.stderr)
+ print(__doc__, file=sys.stderr)
sys.exit(1)
for (o, a) in opts:
if o in ('-h', '--help'):
- print __doc__
......@@ -41,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
verbose += 1
@@ -84,10 +85,10 @@
(bnos, keys_below) = parse_args(sys.argv[1:])
if verbose:
- print 'Using files:',
- for bno in bnos: print bno,
......@@ -51,7 +52,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ for bno in bnos: print(bno, end=' ')
+ if keys_below: print('\nKeys are to be placed below graph')
+ else: print('')
tmpdir = tempfile.mktemp()
os.mkdir(tmpdir)
@@ -99,7 +100,7 @@
......@@ -61,11 +62,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- print >>fo, fld[0], fld[1], int(fld[2])-int(fld[1])
+ print(fld[0], fld[1], int(fld[2])-int(fld[1]), file=fo)
fo.close()
t = t[t.rfind('/')+1:]
@@ -107,16 +108,16 @@
else: plot_cmd = "%s,'%s'" % (plot_cmd, t)
fo = open('%s/plot.cmds' % tmpdir, 'w')
- print >>fo, cmds
- if len(bnos) > 10 or keys_below: print >>fo, 'set key below'
......@@ -74,14 +75,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ if len(bnos) > 10 or keys_below: print('set key below', file=fo)
+ print(plot_cmd, file=fo)
fo.close()
pid = os.fork()
if pid == 0:
cmd = 'gnuplot %s/plot.cmds -' % tmpdir
- if verbose: print 'Executing %s' % cmd
+ if verbose: print('Executing %s' % cmd)
os.chdir(tmpdir)
os.system(cmd)
--- a/btt/btt_plot.py
......@@ -97,17 +98,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+from __future__ import print_function
"""
btt_plot.py: Generate matplotlib plots for BTT generated data files
@@ -82,7 +83,7 @@
def fatal(msg):
"""Generate fatal error message and exit"""
- print >>sys.stderr, 'FATAL: %s' % msg
+ print('FATAL: %s' % msg, file=sys.stderr)
sys.exit(1)
#------------------------------------------------------------------------------
@@ -163,7 +164,7 @@
if not os.path.exists(file):
......@@ -115,11 +116,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
elif verbose:
- print 'Processing %s' % file
+ print('Processing %s' % file)
xs = []
ys = []
@@ -214,8 +215,8 @@
try:
(opts, args) = getopt.getopt(args[1:], s_opts, l_opts)
- except getopt.error, msg:
......@@ -127,32 +128,32 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ except getopt.error as msg:
+ print(msg, file=sys.stderr)
fatal(__doc__)
for (o, a) in opts:
@@ -293,7 +294,7 @@
def color(idx, style):
"""Returns a color/symbol type based upon the index passed."""
- colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ]
+ colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ]
l_styles = [ '-', ':', '--', '-.' ]
m_styles = [ 'o', '+', '.', ',', 's', 'v', 'x', '<', '>' ]
@@ -314,7 +315,7 @@
ofile = '%s.png' % type
if verbose:
- print 'Generating plot into %s' % ofile
+ print('Generating plot into %s' % ofile)
fig = plt.figure(figsize=plot_size)
ax = fig.add_subplot(111)
@@ -329,7 +330,7 @@
legends = None
keys = []
- for file in db.iterkeys():
+ for file in db.keys():
if not file in ['min_x', 'max_x', 'min_y', 'max_y']:
keys.append(file)
Last-Update: 2012-12-23
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Forwarded: no
Forwarded: yes, 2018-05-20
Description: spelling and hyphen corrections.
--- a/blkiomon.c
......@@ -8,13 +8,13 @@ Description: spelling and hyphen corrections.
@@ -472,13 +472,13 @@
break;
}
if (data_is_native == -1 && check_data_endianness(bit->magic)) {
- fprintf(stderr, "blkiomon: endianess problem\n");
+ fprintf(stderr, "blkiomon: endianness problem\n");
break;
}
- /* endianess */
+ /* endianness */
trace_to_cpu(bit);
......@@ -27,11 +27,11 @@ Description: spelling and hyphen corrections.
.SH EXAMPLES
To get I/O statistics for /dev/sdw every 10 seconds for a period of one hour,
use the following command:
- % blktrace /dev/sdw -a issue -a complete -w 3600 -o - | blkiomon -I 10 -h -
+ % blktrace /dev/sdw \-a issue \-a complete \-w 3600 \-o \- | blkiomon \-I 10 \-h \-
.SH AUTHORS
blkiomon and this man page were written by Martin Peschke.
--- a/doc/blkparse.1
......@@ -39,12 +39,12 @@ Description: spelling and hyphen corrections.
@@ -242,9 +242,9 @@
Same as the back merge, except this i/o ends where a previously inserted
requests starts.
.HP 4
-\fBM --front or back merge\fR
+\fBM -- front or back merge\fR
One of the above
.HP 4
\fBM -- front or back merge\fR
--- a/doc/blktrace.8
......@@ -57,17 +57,17 @@ Description: spelling and hyphen corrections.
-Specifying -o - runs in live mode with blkparse (writing data to standard out).
+Specifying \-o \- runs in live mode with blkparse (writing data to standard out).
.RE
\-D \fIdir\fR
.br
@@ -159,9 +159,9 @@
.RS
Prepend \fIfile\fR to output file name(s)
This only works when supplying a single device, or when piping the output
-via "-o -" with multiple devices.
+via "\-o \-" with multiple devices.
.RE
\-r \fIrel-path\fR
.br
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment