Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch
Date: Tue, 24 Aug 2010 18:41:32
Message-Id: 20100824184129.BC06320054@flycatcher.gentoo.org
1 zzam 10/08/24 18:41:29
2
3 Added:
4 udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch
5 Log:
6 Version bumped. Fixed dir_writable check printing an error to console when test fails, bug #326825.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-fs/udev/files/udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/files/udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/files/udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch?rev=1.1&content-type=text/plain
14
15 Index: udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch
16 ===================================================================
17 commit b367a1c9d8a0f565effcdb45f86a365be1c8b622
18 Author: Jan Drzewiecki <jonie@××××××.pl>
19 Date: Fri Aug 13 07:24:29 2010 +0200
20
21 cdrom_id: Drop MEDIA_SESSION_NEXT for DVD-RW-RO
22
23 Commit cf2205a fixed the media status for fresh DVD-RW in restricted overwrite
24 mode, but missed a detail: We should not report the ID_CDROM_MEDIA_SESSION_NEXT
25 property either, since in that mode you can never append tracks/sessions; this
26 just works in sequential mode.
27
28 Signed-off-by: Martin Pitt <martin.pitt@××××××.com>
29
30 diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
31 index d59991c..f9d6e0b 100644
32 --- a/extras/cdrom_id/cdrom_id.c
33 +++ b/extras/cdrom_id/cdrom_id.c
34 @@ -690,8 +690,9 @@ static int cd_media_info(struct udev *udev, int fd)
35 }
36
37 determined:
38 - /* "other" is e. g. DVD-RAM, can't append sessions there either */
39 - if ((header[2] & 3) < 2)
40 + /* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in
41 + * restricted overwrite mode can never append, only in sequential mode */
42 + if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro)
43 cd_media_session_next = header[10] << 8 | header[5];
44 cd_media_session_count = header[9] << 8 | header[4];
45 cd_media_track_count = header[11] << 8 | header[6];