From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 27 Mar 2013 12:42:05 +0000 (+0100)
Subject: fixup: strip newline when recreating (master) changelogs. (Closes: #DEVINF-350)
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d1541fd357025f52a6fc1c2da9294083ff23a967;p=profitbricks%2Fjenkins-build-scripts.git

fixup: strip newline when recreating (master) changelogs. (Closes: #DEVINF-350)
---

diff --git a/debian_build.py b/debian_build.py
index 9ca8baa..e6b2f47 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -471,7 +471,7 @@ if __name__ == '__main__':
           line_counter += 1
           if line_counter == 3:
               print '  * Generated by jenkins build of %s' % git_helper.git_get_commit_id()
-          print line.strip()
+          print line.rstrip('\n')
 
     # we need to commit here else git-buildpackage will use the existing debian/changelog...
     # TODO: Later we should investigate why "--ignore-new" does not work!
@@ -486,7 +486,7 @@ if __name__ == '__main__':
         if line.startswith(' --'):
             line_counter += 1
         if line_counter <= 2:
-            print('debian/changelog: %s' %(line.strip()))
+            print('debian/changelog: %s' %(line.rstrip('\n')))
 
     # let's test if we can tag this build, so we can fail early if we cannot tag it later
     if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'):