[oe-commits] org.oe.dev ipkg-utils: Support reading both "control" and "./control" from tar archives.

[pfalcon commit]

ipkg-utils: Support reading both "control" and "./control" from tar archives.
* Fixes #2381.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7a8b58eb1559ce42d012bca6d3e376d7039ca042
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7a8b58eb1559ce42d012bca6d3e376d7039ca042
Files:
1
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
Diffs:

#
# mt diff -reac29782e598d26c29482f6cb57ba58cbaeb70ca -r7a8b58eb1559ce42d012bca6d3e376d7039ca042
#
# 
# 
# patch "packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch"
#  from [a351c21502faa71fd5c654d9062d5ad3c0f172d1]
#    to [c624f83ac8b14092c184c051137a6dadd55508a6]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [0937fdd9da3c110126392bb2e661c88c924d182a]
#    to [868608b9c3d57a0724a293da4286ea914bcca16d]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [23cdf8b2d949450edbc40f4123ca3d976b7ce2b4]
#    to [0a2b63e7787803d8ac7b949f62fda5064666c738]
# 
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch	a351c21502faa71fd5c654d9062d5ad3c0f172d1
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch	c624f83ac8b14092c184c051137a6dadd55508a6
@@ -158,7 +158,7 @@ Index: ipkg-utils/ipkg.py
  
  class Version:
      """A class for holding parsed package version information."""
-@@ -131,78 +133,58 @@ class Package:
+@@ -131,78 +133,61 @@ class Package:
  	self.section = None
          self.filename_header = None
  	self.file_list = []
@@ -232,7 +232,10 @@ Index: ipkg-utils/ipkg.py
 +            tarStream = ar.open("control.tar.gz")
 +            tarf = tarfile.open("control.tar.gz", "r", tarStream)
 +
-+            control = tarf.extractfile("control")
++            try:
++        	control = tarf.extractfile("control")
++            except KeyError:
++        	control = tarf.extractfile("./control")
 +            self.read_control(control)
              control.close()
 -            if self.isdeb:
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	0937fdd9da3c110126392bb2e661c88c924d182a
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	868608b9c3d57a0724a293da4286ea914bcca16d
@@ -1,7 +1,7 @@ RDEPENDS = ""
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r12"
+PR = "r13"
 
 inherit native
 
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	23cdf8b2d949450edbc40f4123ca3d976b7ce2b4
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	0a2b63e7787803d8ac7b949f62fda5064666c738
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \