Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2017-03-05 17:52:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Sun Mar 5 17:52:39 2017 rev:73 rq:460834 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2016-08-10 19:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2017-03-05 17:52:40.584015414 +0100 @@ -1,0 +2,7 @@ +Tue Jan 31 13:52:36 MST 2017 - [email protected] + +- bsc#978225 - yast virtualization menu not updated after install + KVM and KVM tools +- 3.2.0 + +------------------------------------------------------------------- Old: ---- yast2-vm-3.1.30.tar.bz2 New: ---- yast2-vm-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.j8EHnq/_old 2017-03-05 17:52:41.083944655 +0100 +++ /var/tmp/diff_new_pack.j8EHnq/_new 2017-03-05 17:52:41.087944089 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-vm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.30 +Version: 3.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.1.30.tar.bz2 -> yast2-vm-3.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/.travis.yml new/yast2-vm-3.2.0/.travis.yml --- old/yast2-vm-3.1.30/.travis.yml 2016-07-25 10:28:05.038846088 +0200 +++ new/yast2-vm-3.2.0/.travis.yml 2017-02-28 11:38:34.342707588 +0100 @@ -1,16 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "yast-rake gettext" + - docker build -t yast-vm-image . script: - - rake check:syntax - - rake check:pot - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-vm-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/CONTRIBUTING.md new/yast2-vm-3.2.0/CONTRIBUTING.md --- old/yast2-vm-3.1.30/CONTRIBUTING.md 2016-07-25 10:28:05.042846088 +0200 +++ new/yast2-vm-3.2.0/CONTRIBUTING.md 2017-02-28 11:38:34.346707588 +0100 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/Dockerfile new/yast2-vm-3.2.0/Dockerfile --- old/yast2-vm-3.1.30/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-vm-3.2.0/Dockerfile 2017-02-28 11:38:34.362707588 +0100 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/package/yast2-vm.changes new/yast2-vm-3.2.0/package/yast2-vm.changes --- old/yast2-vm-3.1.30/package/yast2-vm.changes 2016-07-25 10:28:05.086846088 +0200 +++ new/yast2-vm-3.2.0/package/yast2-vm.changes 2017-02-28 11:38:34.406707588 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 31 13:52:36 MST 2017 - [email protected] + +- bsc#978225 - yast virtualization menu not updated after install + KVM and KVM tools +- 3.2.0 + +------------------------------------------------------------------- Mon Jul 25 08:07:08 UTC 2016 - [email protected] - Enable for AArch64 (bsc#989900) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/package/yast2-vm.spec new/yast2-vm-3.2.0/package/yast2-vm.spec --- old/yast2-vm-3.1.30/package/yast2-vm.spec 2016-07-25 10:28:05.090846088 +0200 +++ new/yast2-vm-3.2.0/package/yast2-vm.spec 2017-02-28 11:38:34.406707588 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-vm # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.30 +Version: 3.2.0 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.30/src/modules/VirtConfig.rb new/yast2-vm-3.2.0/src/modules/VirtConfig.rb --- old/yast2-vm-3.1.30/src/modules/VirtConfig.rb 2016-07-25 10:28:05.198846088 +0200 +++ new/yast2-vm-3.2.0/src/modules/VirtConfig.rb 2017-02-28 11:38:34.474707588 +0100 @@ -29,6 +29,9 @@ module Yast class VirtConfigClass < Module + + include Yast::Logger + def main Yast.import "UI" @@ -235,6 +238,7 @@ VBox( Left(Label(_("Server: Minimal system to get a running Hypervisor"))), Left(Label(_("Tools: Configure, manage and monitor virtual machines"))), + Left(Label(_("A disabled checkbox means the Hypervisor item has already been installed"))), ), HSpacing(2), ), @@ -317,6 +321,33 @@ ) end + log.info "VirtConfig::ConfigureDom0: Checking for Installed Patterns and Packages" + if isOpenSuse + UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-openSUSE-xen_server")) + # On openSUSE there are no 'tools' patterns for Xen and KVM + if Package.Installed("xen-tools") && Package.Installed("xen-libs") && + Package.Installed("libvirt-daemon-xen") && Package.Installed("tigervnc") && + Package.Installed("virt-manager") + UI.ChangeWidget(Id(:xen_tools), :Enabled, false) + end + UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-openSUSE-kvm_server")) + if Package.Installed("libvirt-daemon-qemu") || Package.Installed("tigervnc") || + Package.Installed("virt-manager") + UI.ChangeWidget(Id(:kvm_tools), :Enabled, false) + end + elsif isSLED + # On SLED there is only a client pattern. The dialog has just a client and LXC checkbox + UI.ChangeWidget(Id(:client_tools), :Enabled, !Package.Installed("patterns-sled-virtualization_client")) + else + UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-sles-xen_server")) + UI.ChangeWidget(Id(:xen_tools), :Enabled, !Package.Installed("patterns-sles-xen_tools")) + UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-sles-kvm_server")) + UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-sles-kvm_tools")) + end + if Package.Installed("libvirt-daemon-lxc") && Package.Installed("libvirt-daemon-config-network") + UI.ChangeWidget(Id(:lxc), :Enabled, false) + end + widget_id = UI.UserInput if widget_id == :accept install_xen_server = UI.QueryWidget(Id(:xen_server), :Value) @@ -378,9 +409,9 @@ result = true if isOpenSuse == true packages = ["patterns-openSUSE-xen_server"] if install_xen_server - packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "tigervnc"] if install_xen_tools + packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "tigervnc", "virt-manager"] if install_xen_tools packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server - packages = packages + ["libvirt-daemon-qemu", "tigervnc"] if install_kvm_tools + packages = packages + ["libvirt-daemon-qemu", "tigervnc", "virt-manager"] if install_kvm_tools packages = packages + ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] if install_lxc result = Package.DoInstall(common_vm_packages + packages) if result == false
