Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-11-28 08:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vm-install" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-09-05 09:34:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-11-28 08:45:02.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 4 16:20:03 MST 2014 - carnold@suse.com + +- bnc#906248 - opensuse 13.2 i586 bit not installable as xen pv-guest +- Add i686 arch for kernel/initrd lookup +- Remove unused ia64 code +- Version 0.8.34 + +------------------------------------------------------------------- +Tue Nov 4 16:20:03 MST 2014 - carnold@suse.com + +- bnc#886623 - vm-install: GtkWarning: IA__gtk_widget_event: + assertion 'WIDGET_REALIZED_FOR_EVENT (widget, event)' failed gtk.main() +- Version 0.8.33 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.32.tar.bz2 New: ---- vm-install-0.8.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.0hns2A/_old 2014-11-28 08:45:04.000000000 +0100 +++ /var/tmp/diff_new_pack.0hns2A/_new 2014-11-28 08:45:04.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vm-install %if %suse_version <= 1230 %define with_vminstall_as_default_installer 1 @@ -26,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.32 +Version: 0.8.34 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.8.32.tar.bz2 +Source0: %{name}-0.8.34.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ppc64le ++++++ vm-install-0.8.32.tar.bz2 -> vm-install-0.8.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/Makefile new/vm-install-0.8.34/Makefile --- old/vm-install-0.8.32/Makefile 2014-09-03 23:29:58.000000000 +0200 +++ new/vm-install-0.8.34/Makefile 2014-11-20 22:11:12.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.32 +VER = 0.8.34 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/setup.py new/vm-install-0.8.34/setup.py --- old/vm-install-0.8.32/setup.py 2014-09-03 23:29:54.000000000 +0200 +++ new/vm-install-0.8.34/setup.py 2014-11-20 22:11:06.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.32', + version='0.8.34', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing@novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/VMSUSE.py new/vm-install-0.8.34/src/vminstall/VMSUSE.py --- old/vm-install-0.8.32/src/vminstall/VMSUSE.py 2014-05-14 21:17:13.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/VMSUSE.py 2014-11-20 21:54:16.000000000 +0100 @@ -79,7 +79,13 @@ # The packages may or may not have a version. # There may or may not be a leading path component, specifying the disc. kre = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[0-9][-_\.0-9a-zA-Z]*)?\.rpm' % (arch, kernel)) - ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[0-9][-_\.0-9a-zA-Z]*)?\.rpm' % (arch, 'install-initrd')) + ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[a-zA-Z0-9]*)?([-_\.0-9a-zA-Z]*)?\.rpm' % (arch, 'install-initrd')) + # Fix old assumption that install-initrd.rpm and kernel-xen.rpm are in same <arch> directory (not true for 13.x 32bit) + if arch == 'i686': + alt_initrd_arch = 'i586' + alt_ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[a-zA-Z0-9]*)?([-_\.0-9a-zA-Z]*)?\.rpm' % (alt_initrd_arch, 'install-initrd')) + else: + alt_ire = alt_initrd_arch = None for line in lines: m = kre.match(line) if m: @@ -92,6 +98,8 @@ break else: m = ire.match(line) + if m is None and alt_ire: + m = alt_ire.match(line) if m: log.debug("Found initrd line: '%s'" % (line,)) paths = line.split('/') @@ -103,7 +111,7 @@ if not kernel_rpm or not initrd_rpm: raise InstSrcError(err=InstSrcError.E_BAD, details=msg.suse_kernel_not_found) - return [kernel_disc, kernel_rpm, initrd_disc, initrd_rpm] + return [alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm] def _buildInitrd(self, krpm, irpm, progress=lambda f:None): (fd, ifn) = tempfile.mkstemp(prefix='inst-initrd.') @@ -213,7 +221,7 @@ fobj = open(index_path) except: raise InstSrcError(InstSrcError.E_BAD, details='\n'.join(searched)) - (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj, supports_32nonpae) + (arch, ext, alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj, supports_32nonpae) # FIXME: may have to prompt to swap CDs... @@ -221,7 +229,10 @@ krpm = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.1)) kfd.close() - ifd = open('%s/suse/%s/%s' % (root, arch, initrd_rpm), 'r') + if alt_initrd_arch: + ifd = open('%s/suse/%s/%s' % (root, alt_initrd_arch, initrd_rpm), 'r') + else: + ifd = open('%s/suse/%s/%s' % (root, arch, initrd_rpm), 'r') irpm = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.1+f*0.1)) ifd.close() self.ifn = self._buildInitrd(krpm, irpm, lambda f:progress(0.2+f*0.4)) @@ -293,7 +304,7 @@ try: url = base + '/INDEX.gz' fobj = urlopen(url) - (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj, supports_32nonpae) + (arch, ext, alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj, supports_32nonpae) # This is a heuristic: If both are on DVD1 (or CD1, or foo1, ...) # or the disc isn't listed at all, then don't rewrite. If the discs @@ -319,7 +330,10 @@ kfd.close() progress(0.15) - iurl = '/suse/%s/%s' % (arch, initrd_rpm) + if alt_initrd_arch: + iurl = '/suse/%s/%s' % (alt_initrd_arch, initrd_rpm) + else: + iurl = '/suse/%s/%s' % (arch, initrd_rpm) log.debug("URL of initrd is %s" % iurl) url = ibase + iurl ifd = urlopen(url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/caps.py new/vm-install-0.8.34/src/vminstall/caps.py --- old/vm-install-0.8.32/src/vminstall/caps.py 2014-07-22 16:04:20.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/caps.py 2014-11-20 21:57:27.000000000 +0100 @@ -127,20 +127,18 @@ if is_kvm() or is_qemu(): k_arch = kvm_arch() if k_arch == 'x86_64': - arches = [['x86_64', 'default'], ['i586', 'default'], ['i386', 'default']] + arches = [['x86_64', 'default'], ['i686', 'default'], ['i586', 'default'], ['i386', 'default']] elif k_arch == 'i686': - arches = [['i386', 'default'], ['i586', 'default']] + arches = [['i386', 'default'], ['i586', 'default'], ['i686', 'default']] else: arches = [['s390x', 'default']] return arches - if is_ia64_capable(): - arches = [['ia64', 'xen']] - elif is_x86_64_capable(): + if is_x86_64_capable(): if not supports_32nonpae: # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'. - arches = [['i386', 'xen'], ['i586', 'xen'], ['x86_64', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen'], ['x86_64', 'xen']] else: - arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['x86_64', 'xen']] + arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['i686', 'xenpae'], ['x86_64', 'xen']] # x86-64 can do either, but prefer to match dom0. if arch() == 'x86_64': arches.reverse() @@ -148,11 +146,11 @@ if is_pae_capable(): if not supports_32nonpae: # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'. - arches = [['i386', 'xen'], ['i586', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen']] else: - arches = [['i386', 'xenpae'], ['i586', 'xenpae']] + arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['i686', 'xenpae']] else: - arches = [['i386', 'xen'], ['i586', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen']] return arches def kvm_arch(): @@ -168,8 +166,6 @@ if not is_xen(): log.debug("xen_arch.__del__") raise XenError(XenError.E_NO_XEN) - if is_ia64_capable(): - return 'ia64' if is_x86_64_capable(): return 'x86_64' return 'i586' @@ -182,9 +178,6 @@ _caps = open('/sys/hypervisor/properties/capabilities').read().split() return _caps -def is_ia64_capable(): - return 'xen-3.0-ia64' in xen_caps() - def is_x86_64_capable(): return 'xen-3.0-x86_64' in xen_caps() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/gtk/interface.py new/vm-install-0.8.34/src/vminstall/gtk/interface.py --- old/vm-install-0.8.32/src/vminstall/gtk/interface.py 2014-06-13 02:17:53.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/gtk/interface.py 2014-11-20 21:52:10.000000000 +0100 @@ -22,6 +22,7 @@ import threading import time import webbrowser +import warnings from disk_widgets import * from gjob import GJob @@ -2232,5 +2233,7 @@ window.topwin.connect("delete-event", gtk.main_quit) window.connect("vmmcreate-closing", gtk.main_quit) window.show() + if not options.debug: + warnings.simplefilter('ignore', Warning) gtk.main() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org