mirror of
https://git.yoctoproject.org/poky
synced 2026-03-16 04:09:39 +01:00
opkg-utils: ignore packages disapperaring filelist generation
Package files disappearing during index generation don't cause a fatal error. Make package file disappearing during filelist generation also a non-fatal error. (From OE-Core rev: f55c96b6d53ecff865145fa22f286c89c7336515) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e4ebecd065
commit
0963d513a0
@@ -54,3 +54,20 @@ Index: opkg-utils/opkg-make-index
|
||||
if packages_filename:
|
||||
sys.stdout.close()
|
||||
sys.stdout = old_stdout
|
||||
@@ -197,7 +197,15 @@
|
||||
names = packages.packages.keys()
|
||||
names.sort()
|
||||
for name in names:
|
||||
- for fn in packages[name].get_file_list():
|
||||
+ try:
|
||||
+ fnlist = packages[name].get_file_list()
|
||||
+ except OSError, e:
|
||||
+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
|
||||
+ continue
|
||||
+ except IOError, e:
|
||||
+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
|
||||
+ continue
|
||||
+ for fn in fnlist:
|
||||
(h,t) = os.path.split(fn)
|
||||
if not t: continue
|
||||
if not files.has_key(t): files[t] = name+':'+fn
|
||||
|
||||
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "python"
|
||||
RDEPENDS_${PN}_virtclass-native = ""
|
||||
SRCREV = "4747"
|
||||
PV = "0.1.8+svnr${SRCPV}"
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
|
||||
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
|
||||
file://index-ignore-filenotfound.patch \
|
||||
|
||||
Reference in New Issue
Block a user