The following commit has been merged in the master branch: commit 5ccdc88f40ec8bea792874b97596cda8368aff4d Author: Guillem Jover <guil...@debian.org> Date: Sun May 24 22:08:58 2009 +0200
dselect: Properly parse fdisk output in disk setup method util-linux's fdisk has not emitted the Begin column since 1998-06-10 version 2.8. Change the parsing code accordingly to make it actually work. diff --git a/debian/changelog b/debian/changelog index 998cabb..81d3056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ dpkg (1.15.2) UNRELEASED; urgency=low + [ Guillem Jover ] * Fix FTBFS on GNU/Hurd due to a missmatched define usage in start-stop-daemon. * Remove obsolete priorities support from dselect. Thanks to Sven Joachim <svenj...@gmx.de>. * Fix bashism (“echo -e”) in dselect disk setup method. Closes: #530071 + * Properly parse fdisk output in dselect disk setup method. [ Updated dpkg translations ] * Asturian (Marcos Alvarez Costales). Closes: #529889 diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup index 572a35c..8f52d16 100755 --- a/dselect/methods/disk/setup +++ b/dselect/methods/disk/setup @@ -82,9 +82,9 @@ getblockdev () { print_partition_table "$blockbase" >$tp.f set -e proposeddevice="$tryblockdevice" perl -ne ' -next unless /^ *Device +Boot +Begin +Start +End +Blocks +Id +System *$/i .. !/\S/; +next unless /^ *Device +Boot +Start +End +Blocks +Id +System *$/i .. !/\S/; next unless s:^/\S+:: && $& eq $ENV{"proposeddevice"}; -next unless s/^ +(\* +)?\d+ +\d+ +\d+ +\d+\+? +//; +next unless s/^ +(\* +)?\d+ +\d+ +\d+\+? +//; next unless m/^([0-9a-f]{1,2}) /i; %types= ( "1","msdos", "4","msdos", "6","msdos", "7","hpfs", "80","minix", "81","minix", "83","ext2" ); @@ -299,7 +299,7 @@ then fi set -e perl -ne ' -next unless /^ *Device +Boot +Begin +Start +End +Blocks +Id +System *$/i .. !/\S/; +next unless /^ *Device +Boot +Start +End +Blocks +Id +System *$/i .. !/\S/; next unless / [146] +DOS \d+-bit \S+$/; next unless m:^/\S+:; print $&; ' <$tp.f >$tp.d -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org