summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch17
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb2
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 3664df6635..f0f0fcf12c 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
54 if packages_filename: 54 if packages_filename:
55 sys.stdout.close() 55 sys.stdout.close()
56 sys.stdout = old_stdout 56 sys.stdout = old_stdout
57@@ -197,7 +197,15 @@
58 names = packages.packages.keys()
59 names.sort()
60 for name in names:
61- for fn in packages[name].get_file_list():
62+ try:
63+ fnlist = packages[name].get_file_list()
64+ except OSError, e:
65+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
66+ continue
67+ except IOError, e:
68+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
69+ continue
70+ for fn in fnlist:
71 (h,t) = os.path.split(fn)
72 if not t: continue
73 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 fd2b5e693d..e04b74ace5 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"
8RDEPENDS_${PN}_virtclass-native = "" 8RDEPENDS_${PN}_virtclass-native = ""
9SRCREV = "4747" 9SRCREV = "4747"
10PV = "0.1.8+svnr${SRCPV}" 10PV = "0.1.8+svnr${SRCPV}"
11PR = "r4" 11PR = "r5"
12 12
13SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ 13SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
14 file://index-ignore-filenotfound.patch \ 14 file://index-ignore-filenotfound.patch \