aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-05-20 16:35:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-05-20 16:35:23 +0000
commit0996aa4989ab30144c7f19c0f9eec836ffc84f9b (patch)
tree2b65012a42c32cec821252117a0c701bfc21c5da
parentc780b2894c75d7766632f36db9214129e1380c75 (diff)
downloadbitbake-0996aa4989ab30144c7f19c0f9eec836ffc84f9b.tar.gz
cooker.py: Fix invalid regexp in BBMASK error handling (missing import) (#1124)
-rw-r--r--ChangeLog3
-rwxr-xr-xbin/bitbake2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c84a0f6a5..e5460f477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
Changes in BitBake 1.6.7:
- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
- - Raise ParseError for filenames with multiple underscores instead of infinitely looping
+ - Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
+ - Fix invalid regexp in BBMASK error handling (missing import) (#1124)
Changes in BitBake 1.6.5:
- Update the MANIFEST file
diff --git a/bin/bitbake b/bin/bitbake
index 6aa43023e..8558ef855 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -27,7 +27,7 @@ sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'l
import bb
from bb import utils, data, parse, event, cache, providers
from sets import Set
-import itertools, optparse
+import itertools, optparse, sre_constants
parsespin = itertools.cycle( r'|/-\\' )