Author: sh-sh-sh
Date: Tue Apr 8 16:07:06 2008
New Revision: 46239
URL: http://svn.opensuse.org/viewcvs/yast?rev=46239&view=rev
Log:
fixed bug #351593: force auto-check
Modified:
branches/SuSE-SLE-10-SP2-Branch/qt/VERSION
branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes
branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPackageSelector.cc
branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPatternSelector.cc
branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgPatternList.cc
branches/SuSE-SLE-10-SP2-Branch/qt/src/include/YQZypp.h
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/VERSION?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/VERSION (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/VERSION Tue Apr 8 16:07:06 2008
@@ -1 +1 @@
-2.13.83
+2.13.84
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes Tue Apr 8 16:07:06 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Apr 8 15:32:07 CEST 2008 - sh@suse.de
+
+- Fixed bnc #351593: Pattern Conflicts in OES2 SP1
+ Now checking file /var/lib/YaST2/force_full_solver_run
+- V 2.13.84
+
+-------------------------------------------------------------------
Mon Jan 21 17:35:58 CET 2008 - tgoettlicher@suse.de
- Fixed Bug #352845: UI qt segfault after closing opened window
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPackageSelector.cc?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPackageSelector.cc (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPackageSelector.cc Tue Apr 8 16:07:06 2008
@@ -25,6 +25,7 @@
#define ALWAYS_SHOW_PATCHES_VIEW_IF_PATCHES_AVAILABLE 0
#define GLOBAL_UPDATE_CONFIRMATION_THRESHOLD 20
+#include // access()
#include <fstream>
#include
@@ -559,7 +560,12 @@
// Translators: Please keep this short!
_autoDependenciesCheckBox = new QCheckBox( _( "A&utocheck" ), button_box );
CHECK_PTR( _autoDependenciesCheckBox );
- _autoDependenciesCheckBox->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT );
+
+ if ( access( FORCE_FULL_SOLVER_RUN_FILE, F_OK ) == 0 ) // file exists
+ _autoDependenciesCheckBox->setChecked( true );
+ else
+ _autoDependenciesCheckBox->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT );
+
addHStretch( button_box );
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPatternSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPatternSelector.cc?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPatternSelector.cc (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPatternSelector.cc Tue Apr 8 16:07:06 2008
@@ -19,6 +19,9 @@
/-*/
+
+#include // access()
+
#include
#include
#include
@@ -285,6 +288,13 @@
_diskUsageList, SLOT ( updateDiskUsage() ) );
}
+ if ( access( FORCE_FULL_SOLVER_RUN_FILE, F_OK ) == 0 ) // file exists
+ {
+ y2milestone( "Forcing full solver run upon pattern status change" );
+
+ connect( _patternList, SIGNAL( statusChanged() ),
+ this, SLOT ( resolvePackageDependencies() ) );
+ }
}
if ( _selList )
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgPatternList.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgPatternList.cc?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgPatternList.cc (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgPatternList.cc Tue Apr 8 16:07:06 2008
@@ -19,6 +19,8 @@
/-*/
+#include // access()
+
#define y2log_component "qt-pkg"
#include
#include
@@ -315,7 +317,12 @@
void
YQPkgPatternListItem::applyChanges()
{
- solveResolvableCollections();
+ if ( access( FORCE_FULL_SOLVER_RUN_FILE, F_OK ) == -1) // file doesn't exist
+ solveResolvableCollections();
+
+ // else branch handled the YQPkgObjList::statusChanged() signal handler:
+ // connected to YQPackageSelectorBase::resolveDependencies()
+ // if FORCE_FULL_SOLVER_RUN_FILE exists (see YQPatternSelector::makeConnections()
}
Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/include/YQZypp.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/include/YQZypp.h?rev=46239&r1=46238&r2=46239&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/qt/src/include/YQZypp.h (original)
+++ branches/SuSE-SLE-10-SP2-Branch/qt/src/include/YQZypp.h Tue Apr 8 16:07:06 2008
@@ -34,6 +34,8 @@
#include
#include
+#define FORCE_FULL_SOLVER_RUN_FILE "/var/lib/YaST2/force_full_solver_run"
+
using zypp::ui::S_Protected;
using zypp::ui::S_Taboo;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
