From 25de7377c1f6cc2fa6f217b9e9eaca84ab36748d Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 19 Mar 2008 00:01:42 +0000 Subject: QAR-377 maintenance-6 merge: svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/ --- indra/lib/python/indra/util/llmanifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/lib/python') diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 814e1c9f95..9679650104 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -94,7 +94,7 @@ def get_channel(srctree): for p in paths: if os.path.exists(p): contents = open(p, 'r').read() - channel = re.search("LL_CHANNEL\s=\s\"([\w\s]+)\"", contents).group(1) + channel = re.search("LL_CHANNEL\s=\s\"(.+)\";\s*$", contents, flags = re.M).group(1) return channel -- cgit v1.2.3