[oneSIS-devel] SF.net SVN: onesis:[532] trunk/oneSIS.pm/lib/oneSIS.pm

[<jj...@us...>]

Revision: 532
          http://sourceforge.net/p/onesis/code/532
Author:   jjengla
Date:     2017-03-15 15:55:01 +0000 (Wed, 15 Mar 2017)
Log Message:
-----------
Fix sfdisk output parsing for util-linux >= 2.26  (contributed by Kaizaad Bilimorya <ka...@sh...>)

Modified Paths:
--------------
    trunk/oneSIS.pm/lib/oneSIS.pm

Modified: trunk/oneSIS.pm/lib/oneSIS.pm
===================================================================
--- trunk/oneSIS.pm/lib/oneSIS.pm	2017-02-25 00:07:17 UTC (rev 531)
+++ trunk/oneSIS.pm/lib/oneSIS.pm	2017-03-15 15:55:01 UTC (rev 532)
@@ -2818,7 +2818,7 @@
 	  # Use sfdisk to make DOS/MBR partitions
 	  my $sfdisk_input = join("\\n", @{$sfdisk_input{$device}});
 	  $before = $after = `/bin/echo -e "$sfdisk_input" | /sbin/sfdisk -n -Lq -uB /dev/$device 2>&1`;
-	  $before =~ s/(?:.*\n)+Old situation:(?:.*\n)+?((?:\/dev.*\n)+|No partitions found)(?:.*\n)+/$1/;
+	  $before =~ s/(?:.*\n)+Old situation:(?:.*\n)+?((?:\/dev.*\n)+|(?:)|No partitions found)(?:.*\n)+/$1/;
 	  $after =~ s/(?:.*\n)+New situation:(?:.*\n)+?((?:\/dev.*\n)+)(?:.*\n)+/$1/;
 	  if ($before eq $after) {
 	    print "oneSIS: Partition layout of /dev/$device unchanged.  Skipping partitioning ...\n";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.