Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Fri Jan 9 01:46:32 CET 2009. -------- --- perl-Bootloader/perl-Bootloader.changes 2008-12-18 09:28:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2009-01-08 14:14:02.449620000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 8 14:03:36 CET 2009 - jreidinger@suse.cz + +- fix chomping of dmsetup output (bnc #463451) +- fix translating udev dmraid device (bnc #445602) +- 0.4.83 +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.4.82.tar.bz2 New: ---- perl-Bootloader-0.4.83.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.JQ6115/_old 2009-01-09 01:45:37.000000000 +0100 +++ /var/tmp/diff_new_pack.JQ6115/_new 2009-01-09 01:45:37.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Bootloader (Version 0.4.82) +# spec file for package perl-Bootloader (Version 0.4.83) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.4.82 +Version: 0.4.83 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -81,6 +81,10 @@ /boot/boot.readme %changelog +* Thu Jan 08 2009 jreidinger@suse.cz +- fix chomping of dmsetup output (bnc #463451) +- fix translating udev dmraid device (bnc #445602) +- 0.4.83 * Thu Dec 18 2008 jreidinger@suse.cz - RT kernel special support (bnc #450153) - remove obsolete former default, which breaks changing flavor ++++++ perl-Bootloader-0.4.82.tar.bz2 -> perl-Bootloader-0.4.83.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.82/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.83/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.82/lib/Bootloader/Core/GRUB.pm 2008-12-10 10:53:43.000000000 +0100 +++ new/perl-Bootloader-0.4.83/lib/Bootloader/Core/GRUB.pm 2009-01-05 13:59:25.000000000 +0100 @@ -395,14 +395,16 @@ $self->l_milestone ("GRUB::GetKernelDevice: udevadm info returned: $dev"); if ($dev =~ m:^/dev/dm-\d+:){ my $name = qx{udevadm info -q env -n $device | grep DM_NAME}; + chomp $name; if ($name !~ m/^DM_NAME=(.*)/){ $self->l_error ("GRUB::GetKernelDevice: no DM_NAME for dm device: $dev"); return $dev; } $dev = "/dev/mapper/$1"; my $part = qx{udevadm info -q env -n $device | grep DM_PART}; + chomp $part; if ($part =~ m/^DM_PART=(\d+)$/){ - $dev = $dev."_part$part"; + $dev = $dev."_part$1"; } $self->l_milestone("GRUB::GetKernelDevice: dm device translated: $dev"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.82/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.83/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.82/lib/Bootloader/Tools.pm 2008-12-10 10:55:37.000000000 +0100 +++ new/perl-Bootloader-0.4.83/lib/Bootloader/Tools.pm 2009-01-05 09:43:26.000000000 +0100 @@ -242,7 +242,7 @@ $mounted = `mount /sys`; } # FIXME: maybe useless code - my $cmd = "udevadm info -q name -p /block/$udev"; + my $cmd = "udevadm info -q name -p '/block/$udev'"; my $dev = qx{ $cmd 2>/dev/null }; chomp ($dev); @@ -337,6 +337,7 @@ # my @parted_info_list = (); my $parted_info = `parted -s $dev_disk unit cyl print`; + chomp $parted_info; if ( $? == 0 ) { my @parted_info_split = split(/\n/, $parted_info); # skip header lines @@ -443,6 +444,8 @@ return \%ret; } + chomp @result; + my $line = ""; $line = shift @result if (scalar @result != 0); while (scalar @result != 0){ @@ -480,6 +483,7 @@ # Check if device-mapper is available in /proc/misc my $dm_available = qx{grep device-mapper /proc/misc}; + chomp $dm_available; if ($dm_available eq "") { return $retval; @@ -622,10 +626,12 @@ } my @dm_devs = qx{$dmsetup info -c --noheadings -o name | grep -v part}; + chomp @dm_devs; if ($dm_devs[0] !~ /No devices found/) { foreach my $dmdisk (@dm_devs) { my @tables = qx{$dmsetup table '$dmdisk'}; + chomp @tables; foreach my $line (@tables) { my @content = split(/ /, $line); @@ -717,6 +723,7 @@ my $dmdev = shift; my $majmin; $majmin = qx{$dmsetup info -c --noheadings -o major,minor '$dmdev'}; + chomp $majmin; return $majmin; } @@ -744,10 +751,10 @@ $mounted = `mount /sys`; } $majmin = qx{cat /sys$udev_path/dev}; + chomp ($majmin); `umount /sys` if (defined $mounted); } - chomp ($majmin); return $majmin; } @@ -779,6 +786,7 @@ next if $dirent =~ m/^\./; next if -r "$sb/$dirent/range" and qx{ cat $sb/$dirent/range } == 1; $devmajmin = qx{cat $sb/$dirent/dev}; + chomp $devmajmin; my ($p, undef) = (split(/:/, $devmajmin)); if ("$p" eq "$major" ) { @@ -824,6 +832,7 @@ my $majmin = shift; my $dm_name = qx{devmap_name $majmin}; + chomp $dm_name; return $dm_name; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org