From d5641552dd99a5b497c7cbea17620e4bc5d0d24b Mon Sep 17 00:00:00 2001 From: Kevin Murray Date: Fri, 21 Nov 2014 11:23:53 +1100 Subject: [PATCH] Revert erroneous merge conflict resolution Accidentally changed a few unrelated issues while fixing merge conflcits. Reverted as asked to by @mr-c. Also remove duplicated status line introduced in a similar manner. modified: scripts/load-into-counting.py --- scripts/load-into-counting.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/load-into-counting.py b/scripts/load-into-counting.py index cef2716223..73bd6e3696 100755 --- a/scripts/load-into-counting.py +++ b/scripts/load-into-counting.py @@ -81,8 +81,8 @@ def main(): check_space(args.input_sequence_filename) check_space_for_hashtable(args.n_tables * args.min_tablesize) - print >>sys.stderr, 'Saving k-mer counting table', base - print >>sys.stderr, 'Loading kmers from sequences in', repr(filenames) + print >>sys.stderr, 'Saving k-mer counting table to %s' % base + print >>sys.stderr, 'Loading kmers from sequences in %s' % repr(filenames) # clobber the '.info' file now, as we always open in append mode below if os.path.exists(base + '.info'): @@ -134,7 +134,6 @@ def main(): fp_rate = khmer.calc_expected_collisions(htable) with open(base + '.info', 'a') as info_fp: - print >> sys.stderr, "Writing run information to", base + '.info' print >> info_fp, 'fp rate estimated to be %1.3f\n' % fp_rate if args.summary_info: