booty/sme8/booty-0.80.6-Fix-cutting-of-the-partition.patch

From 74763385b8f5b3e6f74a423aa726f0ea9332937c Mon Sep 17 00:00:00 2001
From: Ales Kozumplik <akozumpl@redhat.com>
Date: Fri, 13 May 2011 17:55:50 +0200
Subject: [booty rhel5-branch] Fix cutting of the partition 'p' in getDiskPart(). (#572862)

Before it worked OK for 'mapper/mpath1p2' but it failed to separate the
partition part from 'mapper/rootdevp1' (because the disk part contains no
digits)

This replaces the ancient part of the method with something simpler and
hopefully more general (though it's hard to say it doesn't brake some
other cases).
---
 bootyutil.py |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bootyutil.py b/bootyutil.py
index ea48c44..7b06fdb 100644
--- a/bootyutil.py
+++ b/bootyutil.py
@@ -35,13 +35,9 @@ def getDiskPart(dev):
                 cut = -1
 
     name = dev[:cut]
-
-    # hack off the trailing 'p' from /dev/cciss/*, for example
-    if name[-1] == 'p':
-        for letter in name:
-            if letter not in string.letters and letter != "/":
-                name = name[:-1]
-                break
+    if cut < 0 and name[-1] == 'p':
+        # hack off the trailing 'p' if we found the partition part
+        name = name[:-1]
 
     if cut < 0:
         partNum = int(dev[cut:]) - 1
-- 
1.7.3.3

1	slords	1.1	From 74763385b8f5b3e6f74a423aa726f0ea9332937c Mon Sep 17 00:00:00 2001
2			From: Ales Kozumplik <akozumpl@redhat.com>
3			Date: Fri, 13 May 2011 17:55:50 +0200
4			Subject: [booty rhel5-branch] Fix cutting of the partition 'p' in getDiskPart(). (#572862)
5
6			Before it worked OK for 'mapper/mpath1p2' but it failed to separate the
7			partition part from 'mapper/rootdevp1' (because the disk part contains no
8			digits)
9
10			This replaces the ancient part of the method with something simpler and
11			hopefully more general (though it's hard to say it doesn't brake some
12			other cases).
13			---
14			bootyutil.py \| 10 +++-------
15			1 files changed, 3 insertions(+), 7 deletions(-)
16
17			diff --git a/bootyutil.py b/bootyutil.py
18			index ea48c44..7b06fdb 100644
19			--- a/bootyutil.py
20			+++ b/bootyutil.py
21			@@ -35,13 +35,9 @@ def getDiskPart(dev):
22			cut = -1
23
24			name = dev[:cut]
25			-
26			- # hack off the trailing 'p' from /dev/cciss/*, for example
27			- if name[-1] == 'p':
28			- for letter in name:
29			- if letter not in string.letters and letter != "/":
30			- name = name[:-1]
31			- break
32			+ if cut < 0 and name[-1] == 'p':
33			+ # hack off the trailing 'p' if we found the partition part
34			+ name = name[:-1]
35
36			if cut < 0:
37			partNum = int(dev[cut:]) - 1
38			--
39			1.7.3.3
40