diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-08-20 09:21:12 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-08-20 09:21:12 +0000 |
commit | 21a9ece01504904aa17fd8bb6a673994e503def1 (patch) | |
tree | 379171d558993944b419db69cbac6ecdfcd33bb9 /multimedia/mmpython/files/patch-disc_discinfo.py | |
parent | - Update to 0.4 (diff) |
- Update to 0.4.5
PR: ports/70581
Submitted by: Lewis Thompson <purple@lewiz.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=116748
Diffstat (limited to 'multimedia/mmpython/files/patch-disc_discinfo.py')
-rw-r--r-- | multimedia/mmpython/files/patch-disc_discinfo.py | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/multimedia/mmpython/files/patch-disc_discinfo.py b/multimedia/mmpython/files/patch-disc_discinfo.py deleted file mode 100644 index 0ccac5a03ad2..000000000000 --- a/multimedia/mmpython/files/patch-disc_discinfo.py +++ /dev/null @@ -1,42 +0,0 @@ ---- disc/discinfo.py Sun Feb 8 17:44:05 2004 -+++ disc/discinfo.py Thu Jun 17 00:04:48 2004 -@@ -191,7 +191,9 @@ - - fd = open(device, 'rb') - try: -- fd.seek(0x0000832d) -+ fd.seek(32768) # 2048 multiple boundary for FreeBSD -+ # FreeBSD doesn't return IOError unless we try and read: -+ fd.read(1) - except IOError: - fd.close() - return 3 -@@ -223,22 +225,12 @@ - else: - f = open(device,'rb') - -- f.seek(0x0000832d) -- if os.uname()[0] == 'FreeBSD': -- # why doesn't seeking to 0x0000832d+40 and reading 32 work? -- # no idea, do it this way -- label = f.read(72); -- label = label[40:72] -- else: -- id = f.read(16) -- f.seek(32808, 0) -- if os.uname()[0] == 'FreeBSD': -- # why doesn't seeking to 32808 + 829 and reading 16 work? -- # no idea, do it this way -- id = f.read(829); -- id = id[813:829] -- else: -- label = f.read(32) -+ # FreeBSD can only seek to 2048 multiple boundaries. -+ # Below works on Linux and FreeBSD: -+ f.seek(32768) -+ id = f.read(829) -+ label = id[40:72] -+ id = id[813:829] - - if CREATE_MD5_ID: - id_md5 = md5.new() |