aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MANIFEST2
-rwxr-xr-xbin/bbread7
-rwxr-xr-xsetup.py2
3 files changed, 8 insertions, 3 deletions
diff --git a/MANIFEST b/MANIFEST
index e8677272..12808c2c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,7 @@
MANIFEST
setup.py
bin/bbimage
-bin/bbmake
+bin/bitbake
bin/bbread
lib/bb/__init__.py
lib/bb/build.py
diff --git a/bin/bbread b/bin/bbread
index f48c2aa2..b496e767 100755
--- a/bin/bbread
+++ b/bin/bbread
@@ -22,11 +22,16 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib
import bb, bb.parse, bb.build
d = bb.data.init()
-d = bb.parse.handle(os.path.join('conf', 'bitbake.conf'), d)
+try:
+ d = bb.parse.handle(os.path.join('conf', 'bitbake.conf'), d)
+except IOError, e:
+ bb.fatal("Unable to read conf/bitbake.conf: %s" % e)
if len(sys.argv) == 2:
try:
d = bb.parse.handle(sys.argv[1], d)
+ except IOError, e:
+ bb.fatal("Unable to read %s: %s" % (sys.argv[1], e))
except Exception, e:
bb.fatal("%s" % e)
diff --git a/setup.py b/setup.py
index 4c71b666..f90c3e01 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ setup(name='bitbake',
author_email='clarson@elinux.org',
packages=['bb', 'bb.parse'],
package_dir={'bb': os.path.join('lib', 'bb')},
- scripts=[os.path.join('bin', 'bbmake'),
+ scripts=[os.path.join('bin', 'bitbake'),
os.path.join('bin', 'bbread'),
os.path.join('bin', 'bbimage')],
data_files=[(os.path.join(bbdir, 'conf'), [os.path.join('conf', 'bitbake.conf')]),