Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell <ian.campbell@citrix.com>]

On Thu, 2015-05-21 at 18:23 +0200, Olaf Hering wrote:
> On Thu, May 21, Ian Campbell wrote:
> 
> > On Thu, 2015-05-14 at 15:05 +0100, Ian Campbell wrote:
> > > On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
> > > > xm migrate would do non-live migration (effectively, save, transfer
> > > > and restore) by default, unless you specified --live.
> > > > 
> > > > xl migrate always does live migration.  Honour (by ignoring) --live
> > > > for compatibility with old callers.  Document this.
> > > > 
> > > > (This patch should be backported as far as possible.)
> > > > 
> > > > Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
> > > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > > > CC: Matthew Vernon <mcv21@cam.ac.uk>
> > > 
> > > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> > Applied, thanks.
> 
> I think this causes a build failure, somewhere introduced here:
> 
> git log -p -M --stat e13013d..upstream/staging -- docs/man/
> 
> [  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
> [  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
> [  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
> [  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
> [  146s] make[1]: *** [txt/man/xl.1.txt] Error 255

My pod2text doesn't seem to complain, but does this help?

-----8>-------

>From 5da86305c378482ab2f6359375bd1b63ddc51102 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 21 May 2015 17:31:39 +0100
Subject: [PATCH] docs: correct pod syntax

Olaf reports:
[  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
[  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
[  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
[  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
[  146s] make[1]: *** [txt/man/xl.1.txt] Error 255

Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 docs/man/xl.pod.1 |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index b2bc362..4eb929d 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -1526,8 +1526,12 @@ xl is mostly command-line compatible with the old xm utility used with
 the old Python xend.  For compatibility, the following options are
 ignored:
 
+=over 4
+
 =item B<xl migrate --live>
 
+=back
+
 =head1 TO BE DOCUMENTED
 
 We need better documentation for:
-- 
1.7.10.4