+++ /dev/null
---- ipkg.py
-+++ ipkg.py
-@@ -36,12 +36,17 @@
- import os
- import sys
- import glob
--import md5
- import re
- import string
- import commands
- from stat import ST_SIZE
-
-+try:
-+ from hashlib import md5
-+except ImportError:
-+ import md5
-+ md5 = md5.new
-+
- class Version:
- """A class for holding parsed package version information."""
- def __init__(self, epoch, version):
-@@ -136,7 +141,7 @@
-
- # compute the MD5.
- f = open(fn, "r")
-- sum = md5.new()
-+ sum = md5()
- while 1:
- data = f.read(1024)
- if not data: break
+++ /dev/null
-Index: ipkg-utils-050831/ipkg.py
-===================================================================
---- ipkg-utils-050831/ipkg.py {cset c946c633-8984-433c-8beb-a6cf3926b0af}
-+++ ipkg-utils-050831/ipkg.py {local clone}
-@@ -152,9 +152,9 @@ class Package:
- self.filename = os.path.basename(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 | gtar xfzO - --wildcards '*control'","r")
- else:
-- control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
-+ control = os.popen("gtar xfzO "+fn+" --wildcards '*control.tar.gz' | gtar xfzO - --wildcards '*control'","r")
- line = control.readline()
- while 1:
- if not line: break
-@@ -181,7 +181,7 @@ class Package:
- if self.isdeb:
- data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
- else:
-- data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
-+ data = os.popen("gtar xfzO "+fn+" --wildcards '*data.tar.gz' | gtar tfz -","r")
- while 1:
- line = data.readline()
- if not line: break
-# Checksums: MD5
-# 3b32292e44cc49af1d6c599fd8a44fb8 ipkg.py
-# a103926695d45fe3c6d08a841ed6cd99 ipkg.py [diff]