From 06102b216e1306bad8c38e9cd32fbf6a49a06db1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 28 Mar 2007 20:17:15 +0000 Subject: [PATCH] Merged from trunk 6316:6318 +------------------------------------------------------------------------+ | 6317 | spaces -> tabs | | zmedico | | |---------+--------------------------------------------------------------| | 6318 | spaces -> tabs | | zmedico | | +------------------------------------------------------------------------+ svn path=/main/branches/prefix/; revision=6320 --- pym/portage/env/loaders.py | 8 ++++---- svnlogmsg.awk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index c19c4001e..33a8c3d4f 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -56,9 +56,9 @@ class AtomFileLoader(DataLoader): self.fname = filename def load(self): - data = {} - errors = {} - line_count = 0 + data = {} + errors = {} + line_count = 0 for file in RecursiveFileLoader(self.fname): f = open(file, 'rb') for line in f: @@ -146,7 +146,7 @@ class KeyValuePairFileLoader(DataLoader): data = {} errors = {} line_count = 0 - for file in RecursiveFileLoader(self.fname): + for file in RecursiveFileLoader(self.fname): f = open(file, 'rb') for line in f: line_count = line_count + 1 # Increment line count diff --git a/svnlogmsg.awk b/svnlogmsg.awk index c3a2dce3a..9fe1d3747 100755 --- a/svnlogmsg.awk +++ b/svnlogmsg.awk @@ -11,7 +11,7 @@ BEGIN { term = 0 print "" print "Merged from trunk " revs - print "" + print "
" } { if ($0 ~ /^--*$/) { @@ -21,7 +21,7 @@ BEGIN { } print "" } else if ($0 ~ /^r[0-9][0-9]* \| .*$/) { - print "
" substr($1, 2) "
" + print "
" substr($1, 2) "
" if ($3 == "vapier") { $3 = "SpankMan" } else if ($3 == "antarus") { -- 2.26.2