diff options
Diffstat (limited to 'packages/ipkg-utils/ipkg-utils-native')
3 files changed, 0 insertions, 68 deletions
diff --git a/packages/ipkg-utils/ipkg-utils-native/.mtn2git_empty b/packages/ipkg-utils/ipkg-utils-native/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/ipkg-utils/ipkg-utils-native/.mtn2git_empty +++ /dev/null diff --git a/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch b/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch deleted file mode 100644 index 00ee391405..0000000000 --- a/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch +++ /dev/null @@ -1,51 +0,0 @@ -Only in ipkg-utils: ipkg-py-sane-vercompare.patch -diff -ur ipkg-utils.org/ipkg.py ipkg-utils/ipkg.py ---- ipkg-utils.org/ipkg.py 2005-01-08 18:08:52.000000000 +0000 -+++ ipkg-utils/ipkg.py 2007-04-04 11:52:46.000000000 +0000 -@@ -48,9 +48,9 @@ - self.epoch = epoch - self.version = version - -- def _versioncompare(self, ref): -- selfversion = self.version -- refversion = ref.version -+ def _versioncompare(self, selfversion, refversion): -+ if not selfversion: selfversion = "" -+ if not refversion: refversion = "" - while 1: - ## first look for non-numeric version component - selfm = re.match('([^0-9]*)(.*)', selfversion) -@@ -89,7 +89,18 @@ - elif (self.epoch < ref.epoch): - return -1 - else: -- return self._versioncompare(ref) -+ self_ver_comps = re.match(r"(.+?)(-r.+)?$", self.version) -+ ref_ver_comps = re.match(r"(.+?)(-r.+)?$", ref.version) -+ #print (self_ver_comps.group(1), self_ver_comps.group(2)) -+ #print (ref_ver_comps.group(1), ref_ver_comps.group(2)) -+ r = self._versioncompare(self_ver_comps.group(1), ref_ver_comps.group(1)) -+ if r == 0: -+ r = self._versioncompare(self_ver_comps.group(2), ref_ver_comps.group(2)) -+ #print "compare: %s vs %s = %d" % (self, ref, r) -+ return r -+ -+ def __str__(self): -+ return str(self.epoch) + ":" + self.version - - def parse_version(versionstr): - epoch = 0 -@@ -445,6 +456,13 @@ - return self.packages[key] - - if __name__ == "__main__": -+ -+ assert Version(0, "1.2.2-r1").compare(Version(0, "1.2.3-r0")) == -1 -+ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2+cvs20070308-r0")) == -1 -+ assert Version(0, "1.2.2+cvs20070308").compare(Version(0, "1.2.2-r0")) == 1 -+ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2-r0")) == 0 -+ assert Version(0, "1.2.2-r5").compare(Version(0, "1.2.2-r0")) == 1 -+ - package = Package() - - package.set_package("FooBar") diff --git a/packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch b/packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch deleted file mode 100644 index a9e6fc4d05..0000000000 --- a/packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ../../../work/i686-linux/ipkg-utils-native-1.6+cvs20050404-r6/ipkg-utils/ipkg.py 2005-01-08 19:08:52.000000000 +0100 -+++ ipkg-utils/ipkg.py 2006-06-29 12:52:58.466446000 +0200 -@@ -150,11 +150,11 @@ - stat = os.stat(fn) - self.size = stat[ST_SIZE] - self.filename = os.path.basename(fn) -- ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) -+ sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) - if self.isdeb: -- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r") -+ control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") - else: -- control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r") -+ control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r") - line = control.readline() - while 1: - if not line: break |