Swiftdiff options
| author | Thanos Doukoudakis <thanos.doukoudakis@isode.com> | 2018-03-01 15:42:24 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2018-03-02 14:02:30 (GMT) |
| commit | ab24440f9e30bcc46ca905d88f5e3cccbabbfbee (patch) | |
| tree | 5114cdf7516034c6d440479e9124c859b66b8bd4 | |
| parent | 7c65af2fe15ab7b8c5a88334b5b746896bc133b5 (diff) | |
| download | swift-ab24440f9e30bcc46ca905d88f5e3cccbabbfbee.zip swift-ab24440f9e30bcc46ca905d88f5e3cccbabbfbee.tar.bz2 | |
Fix an issue with help2man and debian packaging
This patch fixes an issue that occurs with help2man when building the
debian package.
It appears that swifts output is interpreted as invalid, so we are adding
the no-discard-stderr to bypass the error.
Test-Information:
Tested packaging scripts on Ubuntu 16.04.4 for jessie and stretch distributions.
Change-Id: I87f48c720e0132aeaad00e6accd37eee44cdcb7b
| -rw-r--r-- | Swift/Packaging/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Packaging/SConscript b/Swift/Packaging/SConscript index bd7e6d8..3aa791f 100644 --- a/Swift/Packaging/SConscript +++ b/Swift/Packaging/SConscript @@ -20,10 +20,10 @@ if env["SCONS_STAGE"] == "build" : swiftenConfigHelp = env.Command( target='$HELP2MAN_DEBIAN_DIR/swiften-config.1', source='#/Swiften/Config/swiften-config', - action = Action('$HELP2MAN -m "Swift Manual" -S "swiften-config" -n "swiften-config" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR")) + action = Action('$HELP2MAN --no-discard-stderr -m "Swift Manual" -S "swiften-config" -n "swiften-config" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR")) swiftHelp = env.Command( target='$HELP2MAN_DEBIAN_DIR/swift-im.1', source='#/Swift/QtUI/swift-im', - action = Action('$HELP2MAN -m "Swift Manual" -S "Swift" -n "swift-im" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR")) + action = Action('$HELP2MAN --no-discard-stderr -m "Swift Manual" -S "Swift" -n "swift-im" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR")) else: print "Enabled help2man but help2man is not in the PATH of the current environment." - Exit(1)
\ No newline at end of file + Exit(1) |