From 6e1b7e16a7b486e910b0d173efbf35f1ab5de85e Mon Sep 17 00:00:00 2001
From: "Auke Booij (tulcod)" <auke@tulcod.com>
Date: Sat, 7 Aug 2010 23:14:43 +0200
Subject: Fix

---
 g_common/g_common.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/g_common/g_common.py b/g_common/g_common.py
index dfe8da7..73b4a0c 100644
--- a/g_common/g_common.py
+++ b/g_common/g_common.py
@@ -117,6 +117,8 @@ def populate_manifest(manifest_file,dir):
             continue
         elif entry[0]=='.': #hidden file, skip
             continue
+        elif entry=='Manifest': #eh, don't process this
+            continue
         elif entry[-len('.ebuild'):]=='.ebuild': #ends in .ebuild
             manifest[entry]=('EBUILD',entry,os.path.getsize(full_entry),{'SHA1':ebuild_digest})
         elif entry=='ChangeLog' or entry=='metadata.xml':
@@ -182,12 +184,10 @@ def generate_tree(repo_location,generate_manifest,generate_metadata):
         os.symlink(ebuild_file,os.path.join(ebuild_dir,package_file))
         if generate_metadata:
             metadata_file=open(os.path.join(ebuild_dir,'metadata.xml'),'w')
-            metadata_file.write("""
-            <?xml version="1.0" encoding="UTF-8"?>
-            <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-            <pkgmetadata>
-            </pkgmetadata>
-            """) #write minimalistic metadata.xml
+            metadata_file.write("""<?xml version="1.0" encoding="UTF-8"?>\n\
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">\n\
+<pkgmetadata>\n\
+</pkgmetadata>""") #write minimalistic metadata.xml
             metadata_file.close()
         if generate_manifest:
             populate_manifest(os.path.join(ebuild_dir,'Manifest'),ebuild_dir)
-- 
cgit v1.2.3-65-gdbad