[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.4.5-2-5-g3974c86

[Iustin Pop]

The following commit has been merged in the master branch:
commit 3974c865bb4ab7d39cfc2054565d03ac0d27fcc4
Author: Iustin Pop <iustin at debian.org>
Date:   Sun May 6 19:13:56 2012 +0200

    Import another upstream patch for LVM compatibility

diff --git a/debian/patches/fix-lvm-2.0.2-88-attrs.patch b/debian/patches/fix-lvm-2.0.2-88-attrs.patch
new file mode 100644
index 0000000..b994982
--- /dev/null
+++ b/debian/patches/fix-lvm-2.0.2-88-attrs.patch
@@ -0,0 +1,38 @@
+From: Iustin Pop <iustin at google.com>
+Subject: [PATCH stable-2.5] Fix LVM volume listing with newer LVM
+ Per commit 0304f0e, newer LVM has extended the lv_attr field. However,
+ that commit was incomplete as we examine this attribute in another
+ place in the code.
+
+ Thanks to user alperhome, the _LVSLINE_REGEX in lib/backend.py also
+ needs fixing. I've used the same change as in the above commit: accept
+ at minimum 6 characters, but allow for more.
+ ---
+ lib/backend.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/backend.py b/lib/backend.py
+index 859f94c..a76157f 100644
+--- a/lib/backend.py
++++ b/lib/backend.py
+@@ -1,7 +1,7 @@
+ #
+ #
+ 
+-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.
++# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -77,7 +77,7 @@ _IES_PID_FILE = "pid"
+ _IES_CA_FILE = "ca"
+ 
+ #: Valid LVS output line regex
+-_LVSLINE_REGEX = re.compile("^ *([^|]+)\|([^|]+)\|([0-9.]+)\|([^|]{6})\|?$")
++_LVSLINE_REGEX = re.compile("^ *([^|]+)\|([^|]+)\|([0-9.]+)\|([^|]{6,})\|?$")
+ 
+ 
+ class RPCFail(Exception):
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index ff54fa6..608b94c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 fix-old-style-imports.patch
+fix-lvm-2.0.2-88-attrs.patch

-- 
Ganeti packaging