summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch73
1 files changed, 0 insertions, 73 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
deleted file mode 100644
index f0f0fcf12c..0000000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1If we're building an image and some package rebuilds while this is happening
2some package can be removed/added to the ipk deploy directory. The image will
3not depend on this package so we can safely ignore these cases rather than
4error out.
5
6RP - 26/8/09
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Index: opkg-utils/opkg-make-index
11===================================================================
12--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
13+++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100
14@@ -96,6 +96,7 @@
15 files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
16 files.sort()
17 for filename in files:
18+ try:
19 basename = os.path.basename(filename)
20 pkg = None
21 fnameStat = os.stat(filename)
22@@ -130,6 +131,12 @@
23 to_morgue(basename)
24 if opt_s:
25 print filename
26+ except OSError:
27+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
28+ continue
29+ except IOError:
30+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
31+ continue
32
33 pkgsStampsFile = open(stamplist_filename, "w")
34 for f in pkgsStamps.keys():
35@@ -148,6 +155,7 @@
36 names = packages.packages.keys()
37 names.sort()
38 for name in names:
39+ try:
40 pkg = packages.packages[name]
41 if locales_dir and pkg.depends:
42 depends = string.split(pkg.depends, ',')
43@@ -165,6 +173,13 @@
44 if (verbose):
45 sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
46 print pkg
47+ except OSError:
48+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
49+ continue
50+ except IOError:
51+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
52+ continue
53+
54 if packages_filename:
55 sys.stdout.close()
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