Index: branches/2015Q2/deskutils/virt-manager/Makefile =================================================================== --- branches/2015Q2/deskutils/virt-manager/Makefile (revision 384992) +++ branches/2015Q2/deskutils/virt-manager/Makefile (revision 384993) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= virt-manager PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \ vte3>=0:${PORTSDIR}/x11-toolkits/vte3 \ ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \ gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \ libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \ libosinfo>=0:${PORTSDIR}/devel/libosinfo \ spice-gtk>=0.26:${PORTSDIR}/deskutils/spice-gtk PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} USES= python:2.7 gettext shebangfix USE_PYTHON= autoplist distutils USE_GNOME= introspection:run intltool librsvg2 pygobject3 INSTALLS_ICONS= yes SHEBANG_FILES= virt-manager \ virt-install \ virt-clone \ virt-convert GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml #add workaround for two autoplist functions post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas/ .for file in ${GLIB_SCHEMAS} ${INSTALL_DATA} ${WRKSRC}/data/${file} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas .endfor .include Index: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py =================================================================== --- branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (nonexistent) +++ branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (revision 384993) @@ -0,0 +1,32 @@ +From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Sun, 26 Apr 2015 11:50:01 -0400 +Subject: serialcon: Fix opening with xen (bz 1215357) + +Apparently xen doesn't set device alias names, and OpenConsole +just opens the first device unconditionally. + +Properly handling that would be to report it in the UI that we can +only open the first console, but for now just drop the alias check. +Apparently SUSE already does this as mentioned in the RH bug + +https://bugzilla.redhat.com/show_bug.cgi?id=1215357 + +diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py +index 92c2029..320811b 100644 +--- ./virtManager/serialcon.py ++++ ./virtManager/serialcon.py +@@ -205,8 +205,9 @@ class LibvirtConsoleConnection(ConsoleConnection): + name = dev and dev.alias.name or None + logging.debug("Opening console stream for dev=%s alias=%s", + dev, name) +- if not name: +- raise RuntimeError(_("Cannot open a device with no alias name")) ++ # libxl doesn't set aliases, their open_console just defaults to ++ # opening the first console device, so don't force prescence of ++ # an alias + + stream = self.conn.get_backend().newStream(libvirt.VIR_STREAM_NONBLOCK) + self.vm.open_console(name, stream) +-- +cgit v0.10.2 Property changes on: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 384992) +++ branches/2015Q2 (revision 384993) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r384986