[X2Go-Commits] [x2goserver] 03/04: x2goserver/bin/x2gogetapps: do not print spurious newlines.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 16 06:30:25 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit e305c5ae00fe2b47e0d1029714d730509e96803b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Mar 13 01:28:15 2015 +0100
x2goserver/bin/x2gogetapps: do not print spurious newlines.
Conflicts:
debian/changelog
---
debian/changelog | 1 +
x2goserver/bin/x2gogetapps | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2508b02..053a167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
- x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't
parse the full desktop file if there are non-Desktop Entries groups.
Based on a patch submitted by Jason Alavaliant. Fixes: #812.
+ - x2goserver/bin/x2gogetapps: do not print spurious newlines.
-- X2Go Release Manager <git-admin at x2go.org> Tue, 24 Feb 2015 22:11:49 +0100
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index 0c3f1ff..8725119 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -103,7 +103,7 @@ sub geticon
{
push(@ret, encode_base64($buf));
}
- push(@ret, "</icon>\n");
+ push(@ret, "</icon>");
close(I);
}
else
@@ -179,12 +179,13 @@ sub proc_desktop_file
}
}
close (F);
- push(@output, "</desktop>\n");
+ push(@output, "</desktop>");
# Print out parsed entry if it's not hidden or marked NoDisplay.
if (! $nodisplay)
{
print join("\n", @output);
+ print "\n";
}
}
else
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list