egencache: use textwrap.dedent
authorZac Medico <zmedico@gentoo.org>
Sat, 14 Jan 2012 17:01:38 +0000 (09:01 -0800)
committerZac Medico <zmedico@gentoo.org>
Sat, 14 Jan 2012 17:01:38 +0000 (09:01 -0800)
bin/egencache

index 7a87bb62c02641b70564482a641ccc0960ee042d..2f81966c64e943411113b6ffc0db886633c62f1e 100755 (executable)
@@ -503,12 +503,12 @@ class GenUseLocalDesc(object):
                                errors='backslashreplace')
                        output.write(_unicode_decode('\n'))
                else:
-                       output.write(_unicode_decode('''
-# This file is deprecated as per GLEP 56 in favor of metadata.xml. Please add
-# your descriptions to your package's metadata.xml ONLY.
-# * generated automatically using egencache *
+                       output.write(textwrap.dedent(_unicode_decode('''
+                               # This file is deprecated as per GLEP 56 in favor of metadata.xml. Please add
+                               # your descriptions to your package's metadata.xml ONLY.
+                               # * generated automatically using egencache *
 
-'''.lstrip()))
+                               '''.lstrip())))
 
                # The cmp function no longer exists in python3, so we'll
                # implement our own here under a slightly different name
@@ -690,12 +690,12 @@ class GenChangeLogs(object):
                        self.returncode |= 2
                        return
 
-               output.write(_unicode_decode('''
-# ChangeLog for %s
-# Copyright 1999-%s Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+               output.write(textwrap.dedent(_unicode_decode('''
+                       # ChangeLog for %s
+                       # Copyright 1999-%s Gentoo Foundation; Distributed under the GPL v2
+                       # $Header: $
 
-''' % (cp, time.strftime('%Y'))).lstrip())
+                       ''' % (cp, time.strftime('%Y'))).lstrip()))
 
                # now grab all the commits
                commits = self.grab(['git', 'rev-list', 'HEAD', '--', '.']).split()