Merged from trunk 6316:6318

   +------------------------------------------------------------------------+
   | 6317    | spaces -> tabs                                               |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6318    | spaces -> tabs                                               |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6320

diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py
index c19c4001e681a88605f33a9012a40791cf0a62ba..33a8c3d4f78f33f32d85bd208efee3891430fb84 100644 (file)
--- 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 c3a2dce3af4382e16d4c717da45b7286d08f6b59..9fe1d37473c4514297aaed0d61e691bf4d2662f0 100755 (executable)
--- a/svnlogmsg.awk
+++ b/svnlogmsg.awk
@@ -11,7 +11,7 @@ BEGIN {
        term = 0
        print "<html>"
        print "Merged from trunk " revs
-       print "<table border=\"1\">"
+       print "<table border=\"1\" width=\"100%\">"
 }
 {
        if ($0 ~ /^--*$/) {
@@ -21,7 +21,7 @@ BEGIN {
                }
                print "<tr>"
        } else if ($0 ~ /^r[0-9][0-9]* \| .*$/) {
-               print "<td valign=\"top\">" substr($1, 2) "<br />"
+               print "<td valign=\"top\" width=\"1%\">" substr($1, 2) "<br />"
                if ($3 == "vapier") {
                        $3 = "SpankMan"
                } else if ($3 == "antarus") {