Merge pull request #31 from gabi2/master

bsc#954117 respect libzypp settings for options "Allow vendor change" and "Cleanup when deleting"
libyui · Nov 26, 2015 · b2e2e14 · b2e2e14
2 parents 2b5ab08 + e91c757
commit b2e2e14
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "45" )
-SET( VERSION_PATCH "5" )
+SET( VERSION_PATCH "6" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/package/libyui-qt-pkg-doc.spec b/package/libyui-qt-pkg-doc.spec
@@ -20,7 +20,7 @@
 %define so_version 7
 
 Name:           %{parent}-doc
-Version:        2.45.5
+Version:        2.45.6
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-qt-pkg.changes b/package/libyui-qt-pkg.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 25 14:52:07 CET 2015 - gs@suse.de
+
+- Respect /etc/zypp/zypp.conf settings for options "Allow vendor
+  change" and "Cleanup when deleting packages" (bsc#954117)
+- 2.45.6
+
 -------------------------------------------------------------------
 Tue Sep 22 08:41:56 UTC 2015 - ancor@suse.com
 

diff --git a/package/libyui-qt-pkg.spec b/package/libyui-qt-pkg.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-qt-pkg
-Version:        2.45.5
+Version:        2.45.6
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/YQPackageSelector.cc b/src/YQPackageSelector.cc
@@ -1779,6 +1779,14 @@ YQPackageSelector::loadCommonSettings()
     }
     _installRecommendedAction->setChecked(install_recommended);
     pkgInstallRecommendedChanged(install_recommended);
+
+    bool allow_vendor_change = zypp::getZYpp()->resolver()->allowVendorChange();
+    _allowVendorChangeAction->setChecked(allow_vendor_change);
+    pkgAllowVendorChangeChanged(allow_vendor_change);
+
+    bool clean_deps_on_remove = zypp::getZYpp()->resolver()->cleandepsOnRemove();
+    _cleanDepsOnRemoveAction->setChecked(clean_deps_on_remove);
+    pkgCleanDepsOnRemoveChanged(clean_deps_on_remove);
 }
 
 void