Patchwork [V2] opkg-utils: ignore packages disapperaring filelist generation

login
register
mail settings
Submitter lumag
Date Aug. 26, 2011, 1:49 p.m.
Message ID <1314366565-9185-1-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/10609/
State New, archived
Headers show

Comments

lumag - Aug. 26, 2011, 1:49 p.m.
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(-)
Richard Purdie - Aug. 29, 2011, 1:09 p.m.
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

Patch

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 \