Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2015-07-05 17:54:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2015-01-21 21:52:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2015-07-05 17:54:52.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Jun 22 13:46:17 UTC 2015 - mvidner@suse.com
+
+- Unified option handling with NCurses (FATE#318099)
+ - "System verification mode" and "Dependencies/Autocheck"
+ moved to /etc/sysconfig/yast2 (PKGMGR_VERIFY_SYSTEM,
+ PKGMGR_AUTO_CHECK).
+ - made "Cleanup when deleting packages" and "Allow vendor
+ change" not persistent.
+- Added option Dependencies/Install Recommended Packages,
+ (PKGMGR_RECOMMENDED) (boo#900853).
+- Changed "Options/Ignore Recommended Packages for Already
+ Installed Packages" from an option to a command
+ "Extras/Install All Matching Recommended Packages" (boo#902394).
+- 2.45.0
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.44.8.tar.bz2
New:
----
libyui-qt-pkg-2.45.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.rgjbNp/_old 2015-07-05 17:54:53.000000000 +0200
+++ /var/tmp/diff_new_pack.rgjbNp/_new 2015-07-05 17:54:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-qt-pkg-doc
-Version: 2.44.8
+Version: 2.45.0
Release: 0
Source: libyui-qt-pkg-%{version}.tar.bz2
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.rgjbNp/_old 2015-07-05 17:54:53.000000000 +0200
+++ /var/tmp/diff_new_pack.rgjbNp/_new 2015-07-05 17:54:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-qt-pkg
-Version: 2.44.8
+Version: 2.45.0
Release: 0
Source: libyui-qt-pkg-%{version}.tar.bz2
++++++ libyui-qt-pkg-2.44.8.tar.bz2 -> libyui-qt-pkg-2.45.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.8/ChangeLog new/libyui-qt-pkg-2.45.0/ChangeLog
--- old/libyui-qt-pkg-2.44.8/ChangeLog 2015-01-20 15:40:59.000000000 +0100
+++ new/libyui-qt-pkg-2.45.0/ChangeLog 2015-06-30 16:19:38.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Mon Jun 22 13:46:17 UTC 2015 - mvidner@suse.com
+
+- Unified option handling with NCurses (FATE#318099)
+ - "System verification mode" and "Dependencies/Autocheck"
+ moved to /etc/sysconfig/yast2 (PKGMGR_VERIFY_SYSTEM,
+ PKGMGR_AUTO_CHECK).
+ - made "Cleanup when deleting packages" and "Allow vendor
+ change" not persistent.
+- Added option Dependencies/Install Recommended Packages,
+ (PKGMGR_RECOMMENDED) (boo#900853).
+- Changed "Options/Ignore Recommended Packages for Already
+ Installed Packages" from an option to a command
+ "Extras/Install All Matching Recommended Packages" (boo#902394).
+- 2.45.0
+
+-------------------------------------------------------------------
Tue Jan 20 14:36:27 UTC 2015 - mvidner@suse.com
- Fix cmake also in the spec file, duh.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.8/VERSION.cmake new/libyui-qt-pkg-2.45.0/VERSION.cmake
--- old/libyui-qt-pkg-2.44.8/VERSION.cmake 2015-01-15 16:41:14.000000000 +0100
+++ new/libyui-qt-pkg-2.45.0/VERSION.cmake 2015-06-30 16:19:38.000000000 +0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
-SET( VERSION_MINOR "44" )
-SET( VERSION_PATCH "8" )
+SET( VERSION_MINOR "45" )
+SET( VERSION_PATCH "0" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.8/src/YQPackageSelector.cc new/libyui-qt-pkg-2.45.0/src/YQPackageSelector.cc
--- old/libyui-qt-pkg-2.44.8/src/YQPackageSelector.cc 2014-05-21 13:55:22.000000000 +0200
+++ new/libyui-qt-pkg-2.45.0/src/YQPackageSelector.cc 2015-06-30 16:19:38.000000000 +0200
@@ -111,6 +111,7 @@
#include "zypp/SysContent.h"
#include "zypp/base/String.h"
+#include "zypp/base/Sysconfig.h"
#include "QY2ComboTabWidget.h"
#include "YQDialog.h"
@@ -131,8 +132,10 @@
#define FAST_SOLVER 1
#define SETTINGS_DIR "YaST2"
-
-
+#define PATH_TO_YAST_SYSCONFIG "/etc/sysconfig/yast2"
+#define OPTION_VERIFY "PKGMGR_VERIFY_SYSTEM"
+#define OPTION_AUTO_CHECK "PKGMGR_AUTO_CHECK"
+#define OPTION_RECOMMENDED "PKGMGR_RECOMMENDED"
YQPackageSelector::YQPackageSelector( YWidget * parent,
@@ -795,10 +798,16 @@
action->setText(_( "&Dependencies" ));
_dependencyMenu->addAction( _( "&Check Now" ), this, SLOT( manualResolvePackageDependencies() ) );
+
_autoDependenciesAction = new QAction( _( "&Autocheck" ), this );
_autoDependenciesAction->setCheckable( true );
_dependencyMenu->addAction( _autoDependenciesAction );
+ _installRecommendedAction = _dependencyMenu->addAction(
+ _("Install &Recommended Packages"),
+ this, SLOT (pkgInstallRecommendedChanged(bool)));
+ _installRecommendedAction->setCheckable( true );
+
//
// View menu
@@ -833,12 +842,6 @@
_verifySystemModeAction->setCheckable(true);
- _ignoreAlreadyRecommendAction = _optionsMenu->addAction( _( "&Ignore Recommended Packages for Already Installed Packages" ),
- this, SLOT( pkgIgnoreAlreadyRecommendedChanged( bool ) ) );
- _ignoreAlreadyRecommendAction->setCheckable(true);
-
-
-
_cleanDepsOnRemoveAction = _optionsMenu->addAction( _( "&Cleanup when deleting packages" ),
this, SLOT( pkgCleanDepsOnRemoveChanged( bool ) ) );
_cleanDepsOnRemoveAction->setCheckable(true);
@@ -877,6 +880,9 @@
// Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"!
_extrasMenu->addAction( _( "Install All Matching -debug&source Packages" ), this, SLOT( installDebugSourcePkgs() ) );
+ _extrasMenu->addAction( _( "Install All Matching &Recommended Packages" ),
+ this, SLOT( installRecommendedPkgs() ) );
+
_extrasMenu->addSeparator();
if ( _pkgConflictDialog )
@@ -1548,6 +1554,27 @@
void
+YQPackageSelector::installRecommendedPkgs()
+{
+ zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( false );
+ resolveDependencies();
+
+ if ( _filters && _statusFilterView )
+ {
+ _filters->showPage( _statusFilterView );
+ _statusFilterView->filter();
+ }
+
+ YQPkgChangesDialog::showChangesDialog( this,
+ _( "Added Subpackages:" ),
+ _( "&OK" ),
+ QString::null, // rejectButtonLabel
+ YQPkgChangesDialog::FilterAutomatic,
+ YQPkgChangesDialog::OptionNone ); // showIfEmpty
+}
+
+
+void
YQPackageSelector::pkgExcludeDebugChanged( bool on )
{
if ( _optionsMenu && _pkgList )
@@ -1579,10 +1606,10 @@
zypp::getZYpp()->resolver()->setSystemVerification( on );
}
-void
-YQPackageSelector::pkgIgnoreAlreadyRecommendedChanged( bool on )
+void
+YQPackageSelector::pkgInstallRecommendedChanged( bool on )
{
- zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( on );
+ zypp::getZYpp()->resolver()->setOnlyRequires( !on );
resolveDependencies();
}
@@ -1711,35 +1738,45 @@
QSettings settings( QSettings::UserScope, SETTINGS_DIR, settingsName );
- _autoDependenciesAction->setChecked( settings.value("Options/AutocheckDependencies",
- AUTO_CHECK_DEPENDENCIES_DEFAULT ).toBool() ) ;
-
_showDevelAction->setChecked(settings.value("Options/showDevelPackages", true).toBool());
pkgExcludeDevelChanged(_showDevelAction->isChecked());
_showDebugAction->setChecked(settings.value("Options/showDebugPackages", true).toBool());
pkgExcludeDebugChanged(_showDebugAction->isChecked());
- _verifySystemModeAction->setChecked( settings.value("Options/systemVerificationMode",
- zypp::getZYpp()->resolver()->systemVerification() ).toBool() );
- pkgVerifySytemModeChanged ( _verifySystemModeAction->isChecked() );
-
- _ignoreAlreadyRecommendAction->setChecked(
- settings.value("Options/IgnoreRecommendedPackagesForAlreadyInstalledPackages",
- zypp::getZYpp()->resolver()->ignoreAlreadyRecommended() ).toBool() );
- pkgIgnoreAlreadyRecommendedChanged(_ignoreAlreadyRecommendAction->isChecked());
-
-
- _cleanDepsOnRemoveAction->setChecked( settings.value("Options/CleanupWhenDeletingPackages",
- zypp::getZYpp()->resolver()->cleandepsOnRemove()).toBool() );
- pkgCleanDepsOnRemoveChanged(_cleanDepsOnRemoveAction->isChecked());
-
- _allowVendorChangeAction->setChecked( settings.value("Options/AllowVendorChange",
- zypp::getZYpp()->resolver()->allowVendorChange() ).toBool() );
- pkgAllowVendorChangeChanged(_allowVendorChangeAction->isChecked());
+ loadCommonSettings();
+}
+void
+YQPackageSelector::loadCommonSettings()
+{
+ map