Alex Williamson
2007-Nov-08 16:17 UTC
[Xen-devel] Re: [Xen-staging] [xen-unstable] xend: Allow for non-existent xen-python-path binary.
On Thu, 2007-11-08 at 15:34 +0000, Xen staging patchbot-unstable wrote:> # HG changeset patch > # User Keir Fraser <keir@xensource.com> > # Date 1194535934 0 > # Node ID 0ebac857649591de0e1b57605b054552afb03297 > # Parent c0bdfda5183d5e9dca5c9bc7a68a6cf40e3f6c58 > xend: Allow for non-existent xen-python-path binary. > On Solaris, xen-python-path is unnecessary.This completely breaks xend for me: # xend start Traceback (most recent call last): File "/usr/sbin/xend", line 36, in ? xpp = os.path.join(os.path.dirname(sys.argv[0], ''xen-python-path'')) TypeError: dirname() takes exactly 1 argument (2 given) Alex> --- > tools/misc/xend | 13 +++++++------ > 1 files changed, 7 insertions(+), 6 deletions(-) > > diff -r c0bdfda5183d -r 0ebac8576495 tools/misc/xend > --- a/tools/misc/xend Thu Nov 08 14:50:01 2007 +0000 > +++ b/tools/misc/xend Thu Nov 08 15:32:14 2007 +0000 > @@ -33,13 +33,14 @@ import time > import time > import commands > > -result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]), > - ''xen-python-path'')) > -if result[0] != 0: > - print >>sys.stderr, result[1] > - sys.exit(1) > +xpp = os.path.join(os.path.dirname(sys.argv[0], ''xen-python-path'')) > +if os.path.exists(xpp): > + result = commands.getstatusoutput(xpp) > + if result[0] != 0: > + print >>sys.stderr, result[1] > + sys.exit(1) > > -sys.path.append(result[1]) > + sys.path.append(result[1]) > > from xen.xend.server import SrvDaemon > > > _______________________________________________ > Xen-staging mailing list > Xen-staging@lists.xensource.com > http://lists.xensource.com/xen-staging >-- Alex Williamson HP Open Source & Linux Org. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2007-Nov-08 16:19 UTC
Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] xend: Allow for non-existent xen-python-path binary.
Ah yes, I suppose the non-Solaris path isn''t tested... -- Keir On 8/11/07 16:17, "Alex Williamson" <alex.williamson@hp.com> wrote:> > On Thu, 2007-11-08 at 15:34 +0000, Xen staging patchbot-unstable wrote: >> # HG changeset patch >> # User Keir Fraser <keir@xensource.com> >> # Date 1194535934 0 >> # Node ID 0ebac857649591de0e1b57605b054552afb03297 >> # Parent c0bdfda5183d5e9dca5c9bc7a68a6cf40e3f6c58 >> xend: Allow for non-existent xen-python-path binary. >> On Solaris, xen-python-path is unnecessary. > > This completely breaks xend for me: > > # xend start > Traceback (most recent call last): > File "/usr/sbin/xend", line 36, in ? > xpp = os.path.join(os.path.dirname(sys.argv[0], ''xen-python-path'')) > TypeError: dirname() takes exactly 1 argument (2 given) > > Alex > >> --- >> tools/misc/xend | 13 +++++++------ >> 1 files changed, 7 insertions(+), 6 deletions(-) >> >> diff -r c0bdfda5183d -r 0ebac8576495 tools/misc/xend >> --- a/tools/misc/xend Thu Nov 08 14:50:01 2007 +0000 >> +++ b/tools/misc/xend Thu Nov 08 15:32:14 2007 +0000 >> @@ -33,13 +33,14 @@ import time >> import time >> import commands >> >> -result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]), >> - ''xen-python-path'')) >> -if result[0] != 0: >> - print >>sys.stderr, result[1] >> - sys.exit(1) >> +xpp = os.path.join(os.path.dirname(sys.argv[0], ''xen-python-path'')) >> +if os.path.exists(xpp): >> + result = commands.getstatusoutput(xpp) >> + if result[0] != 0: >> + print >>sys.stderr, result[1] >> + sys.exit(1) >> >> -sys.path.append(result[1]) >> + sys.path.append(result[1]) >> >> from xen.xend.server import SrvDaemon >> >> >> _______________________________________________ >> Xen-staging mailing list >> Xen-staging@lists.xensource.com >> http://lists.xensource.com/xen-staging >>_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Alex Williamson
2007-Nov-08 16:25 UTC
Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] xend: Allow for non-existent xen-python-path binary.
On Thu, 2007-11-08 at 16:19 +0000, Keir Fraser wrote:> Ah yes, I suppose the non-Solaris path isn''t tested...I''m sure you already figured it out, but here''s the trivial patch. Thanks, Alex Signed-off-by: Alex Williamson <alex.williamson@hp.com> -- diff -r 155a016b8064 tools/misc/xend --- a/tools/misc/xend Thu Nov 08 09:05:26 2007 -0700 +++ b/tools/misc/xend Thu Nov 08 09:23:31 2007 -0700 @@ -33,7 +33,7 @@ import time import time import commands -xpp = os.path.join(os.path.dirname(sys.argv[0], ''xen-python-path'')) +xpp = os.path.join(os.path.dirname(sys.argv[0]), ''xen-python-path'') if os.path.exists(xpp): result = commands.getstatusoutput(xpp) if result[0] != 0: _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
John Levon
2007-Nov-08 16:37 UTC
Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] xend: Allow for non-existent xen-python-path binary.
On Thu, Nov 08, 2007 at 04:19:58PM +0000, Keir Fraser wrote:> Ah yes, I suppose the non-Solaris path isn''t tested...Yes, sorry. I do try to test the ''scarier'' patches by at least building, I just missed this one. regards john _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel