# HG changeset patch
# User Tero Marttila <terom@paivola.fi>
# Date 1335091544 -10800
# Node ID 0a329ac17083e985781f6c1bcc86c26786b61662
# Parent  c8aea2558f164c3cc1c6270599edc2728a41489c
pvl.backup.rsync: also accept lvm:vg/lv

diff -r c8aea2558f16 -r 0a329ac17083 pvl/backup/rsync.py
--- a/pvl/backup/rsync.py	Sun Apr 22 13:42:42 2012 +0300
+++ b/pvl/backup/rsync.py	Sun Apr 22 13:45:44 2012 +0300
@@ -264,12 +264,23 @@
         return RSyncFSServer(path)
 
     elif path.startswith('lvm:') :
+        _, lvm = path.split(':', 1)
+
         # LVM LV
         try :
-            lvm, vg, lv = path.split(':')
+            if ':' in lvm :
+                vg, lv = lvm.split(':', 1)
+
+                log.warn("old lvm: syntax: lvm:%s; use: lvm:%s/%s", path, vg, lv)
+
+            elif '/' in lvm:
+                vg, lv = lvm.split('/', 1)
+
+            else :
+                raise RSyncCommandFormatError("Invalid lvm pseudo-path: {lvm}: unrecognized vg/lv separator".format(lvm=lvm))
 
         except ValueError, e:
-            raise RSyncCommandFormatError("Invalid lvm pseudo-path: {error}".format(error=e))
+            raise RSyncCommandFormatError("Invalid lvm pseudo-path: {lvm}: {error}".format(lvm=lvm, error=e))
         
         # XXX: validate?
         log.info("LVM: %s/%s", vg, lv)