Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-28 09:48:01 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-28 09:48:01 (GMT) |
| commit | 34eb7f55fbdd1566ee117738f3a423354ce1b45c (patch) | |
| tree | b239d9b7966f0b18e39aeeed3c1c76e720760f3c /Swiften/QA/ClientTest/SConscript | |
| parent | 48ffe88bf768fd762a3bcb52717a9079ec803de5 (diff) | |
| download | swift-34eb7f55fbdd1566ee117738f3a423354ce1b45c.zip swift-34eb7f55fbdd1566ee117738f3a423354ce1b45c.tar.bz2 | |
Replace slightly-too-magic MergeFlags by our own UseFlags.
Diffstat (limited to 'Swiften/QA/ClientTest/SConscript')
| -rw-r--r-- | Swiften/QA/ClientTest/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript index 31c4011..15a68c6 100644 --- a/Swiften/QA/ClientTest/SConscript +++ b/Swiften/QA/ClientTest/SConscript @@ -4,8 +4,8 @@ Import("env") if env["TEST"] : myenv = env.Clone() - myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) - myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"]) + myenv.UseFlags(myenv["SWIFTEN_FLAGS"]) + myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"]) for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: if ARGUMENTS.get(i.lower(), False) : |