summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-08-11 23:48:48 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-08-11 23:48:48 +0000
commitd09261da3f61354ec8cdcda444f8000feaa1753f (patch)
tree4e49a0e7b617bc28e742ea7acb274bb72a3cbd06 /classes
parent5b604d5280b567f254c71d38e32d56e6edaa8e02 (diff)
package.bbclass: Fix a typo and remove broken code (from poky)
Diffstat (limited to 'classes')
-rw-r--r--classes/package.bbclass12
1 files changed, 1 insertions, 11 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 48bb8f5956..62f09967d3 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -369,7 +369,7 @@ python populate_packages () {
for pkg in packages.split():
if pkg in package_list:
bb.error("-------------------")
- bb.error("%s is listed in PACKAGES mutliple times, this leads to packaging errors." % pkg)
+ bb.error("%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg)
bb.error("Please fix the metadata/report this as bug to OE bugtracker.")
bb.error("-------------------")
else:
@@ -411,7 +411,6 @@ python populate_packages () {
bb.mkdirhier(root)
filesvar = bb.data.getVar('FILES', localdata, 1) or ""
files = filesvar.split()
- cleandirs = []
for file in files:
if os.path.isabs(file):
file = '.' + file
@@ -420,8 +419,6 @@ python populate_packages () {
newfiles = [ os.path.join(file,x) for x in os.listdir(file) ]
if newfiles:
files += newfiles
- if file != "./":
- cleandirs = [file] + cleandirs
continue
globbed = glob.glob(file)
if globbed:
@@ -433,16 +430,9 @@ python populate_packages () {
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
-# if file in cleandirs:
-# cleandirs.remove(file)
ret = bb.movefile(file,fpath)
if ret is None or ret == 0:
raise bb.build.FuncFailed("File population failed")
-# for dir in cleandirs:
-# if os.path.isdir(dir):
-# os.rmdir(dir)
-# else:
-# bb.note("ERROR: directory %s went away unexpectedly during package population" % dir)
del localdata
os.chdir(workdir)