* [V2] opkg-utils: ignore packages disapperaring filelist generation
@ 2011-08-26 13:49 Dmitry Eremin-Solenikov
2011-08-29 13:09 ` Richard Purdie
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-08-26 13:49 UTC (permalink / raw)
To: openembedded-core; +Cc: Dmitry Eremin-Solenikov
Package files disappearing during index generation don't cause a fatal
error. Make package file disappearing during filelist generation also
a non-fatal error.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
.../opkg-utils/index-ignore-filenotfound.patch | 17 +++++++++++++++++
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 2 +-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
index 3664df6..f0f0fcf 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -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
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index fd2b5e6..e04b74a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
@@ -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 \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [V2] opkg-utils: ignore packages disapperaring filelist generation
2011-08-26 13:49 [V2] opkg-utils: ignore packages disapperaring filelist generation Dmitry Eremin-Solenikov
@ 2011-08-29 13:09 ` Richard Purdie
0 siblings, 0 replies; 2+ messages in thread
From: Richard Purdie @ 2011-08-29 13:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Dmitry Eremin-Solenikov
On Fri, 2011-08-26 at 17:49 +0400, Dmitry Eremin-Solenikov wrote:
> Package files disappearing during index generation don't cause a fatal
> error. Make package file disappearing during filelist generation also
> a non-fatal error.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> .../opkg-utils/index-ignore-filenotfound.patch | 17 +++++++++++++++++
> meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 2 +-
> 2 files changed, 18 insertions(+), 1 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-29 13:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-26 13:49 [V2] opkg-utils: ignore packages disapperaring filelist generation Dmitry Eremin-Solenikov
2011-08-29 13:09 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.