From c1552af53c8d91e7ac839ccde523b7fb7d7133a7 Mon Sep 17 00:00:00 2001 From: David Lehman Date: Tue, 12 Mar 2013 14:30:11 -0500 Subject: [PATCH 4/5] Allow calls to suggestDeviceName with only a prefix argument. Prior to this fix, you'd end up with a trailing underscore in the name. --- blivet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/__init__.py b/blivet/__init__.py index ccca9f1..c77d39a 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -1302,7 +1302,7 @@ class Blivet(object): elif swap: body = "swap" - if prefix: + if prefix and body: body = "_" + body template = self.safeDeviceName(prefix + body) -- 1.8.1.4