changeset
[svn] Fix issues with basename methods. First, string's rsplit method only
Sun, 17 Dec 2006 08:30:32 -0500
- author
- brett
- date
- Sun, 17 Dec 2006 08:30:32 -0500
- branch
- trunk
- changeset 9
- 920417b8acc9
- parent 8
- 97388f5ff770
- child 10
- f0acfe12a0e2
[svn] Fix issues with basename methods. First, string's rsplit method only
arrived in Python 2.4, so don't use it. Second, tweak the RPM basename
method to catch the case where arch == noarch.
| scripts/x | file | annotate | diff | comparison | revisions |
--- a/scripts/x Mon Nov 13 23:06:30 2006 -0500 +++ b/scripts/x Sun Dec 17 08:30:32 2006 -0500 @@ -208,7 +208,7 @@ self.pipe(['rpm2cpio', '-'], "rpm2cpio") def basename(self): - pieces = os.path.basename(self.filename).rsplit('.', 2) + pieces = os.path.basename(self.filename).split('.') if len(pieces) == 1: return pieces[0] elif pieces[-1] != 'rpm': @@ -216,7 +216,7 @@ pieces.pop() if len(pieces) == 1: return pieces[0] - elif len(pieces[-1]) < 6: + elif len(pieces[-1]) < 8: pieces.pop() return '.'.join(pieces) @@ -233,12 +233,13 @@ self.pipe(['zcat'], "data.tar.gz decompression") def basename(self): - pieces = os.path.basename(self.filename).rsplit('_', 1) + pieces = os.path.basename(self.filename).split('_') if len(pieces) == 1: return pieces[0] - elif (len(pieces[-1]) > 10) or (not pieces[-1].endswith('.deb')): + last_piece = pieces.pop() + if (len(last_piece) > 10) or (not last_piece.endswith('.deb')): return BaseExtractor.basename(self) - return pieces[0] + return '_'.join(pieces) def check_contents(self): TarExtractor.check_contents(self)
