From 3ac731087cb5a0c2c1d9cf3a5bcdf518f94d0426 Mon Sep 17 00:00:00 2001
From: Peter Gehres <pgehres@appdynamics.com>
Date: Sun, 9 Mar 2014 12:35:45 -0700
Subject: [PATCH] Fix for #6353 adding a newline between assembled files

---
 library/files/assemble | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/library/files/assemble b/library/files/assemble
index 90c1a90aeb..b7d6c38a04 100644
--- a/library/files/assemble
+++ b/library/files/assemble
@@ -102,21 +102,30 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None):
     tmpfd, temp_path = tempfile.mkstemp()
     tmp = os.fdopen(tmpfd,'w')
     delimit_me = False
+
     for f in sorted(os.listdir(src_path)):
         if compiled_regexp and not compiled_regexp.search(f):
             continue
         fragment = "%s/%s" % (src_path, f)
-        if delimit_me and delimiter:
-            # un-escape anything like newlines
-            delimiter = delimiter.decode('unicode-escape')
-            tmp.write(delimiter)
-            # always make sure there's a newline after the 
-            # delimiter, so lines don't run together
-            if delimiter[-1] != '\n':
-                tmp.write('\n')
+
+        # delimiters should only appear between fragments
+        if delimit_me:
+            # always put a newline between fragments
+            tmp.write('\n')
+
+            if delimiter:
+                # un-escape anything like newlines
+                delimiter = delimiter.decode('unicode-escape')
+                tmp.write(delimiter)
+                # always make sure there's a newline after the
+                # delimiter, so lines don't run together
+                if delimiter[-1] != '\n':
+                    tmp.write('\n')
+
         if os.path.isfile(fragment):
             tmp.write(file(fragment).read())
         delimit_me = True
+
     tmp.close()
     return temp_path