Yuvipanda has submitted this change and it was merged. Change subject: webservice2: Fix crash for tools with custom memory limits ......................................................................
webservice2: Fix crash for tools with custom memory limits Change-Id: I6735ea6a9ba9b8362084b111a85d8be2125be51a --- M debian/changelog M misctools/webservice2 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved Legoktm: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index 7a803d0..0189bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs (1.0.13) unstable; urgency=low + + * webservice2: Fix crash for tools with special memory limits [Yuvi Panda] + + -- Yuvi Panda <[email protected]> Tue, 02 Dec 2014 05:30:01 +0530 + toollabs (1.0.12) unstable; urgency=low * webservice2: Added port of webservice to python [Yuvi Panda] diff --git a/misctools/webservice2 b/misctools/webservice2 index 1a72216..12d6a01 100644 --- a/misctools/webservice2 +++ b/misctools/webservice2 @@ -121,7 +121,7 @@ '/data/project/.system/config/', '%s.web-memlimit' % TOOL ), '4g' -) +).strip() parser = argparse.ArgumentParser() parser.add_argument('server', help='Type of server to start', -- To view, visit https://gerrit.wikimedia.org/r/176836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6735ea6a9ba9b8362084b111a85d8be2125be51a Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Yuvipanda <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
