Mailing Lists
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2023
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
List overview
Download
YaST Commits
April 2008
----- 2023 -----
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
yast-commit@lists.opensuse.org
27 participants
1339 discussions
Start a n
N
ew thread
[yast-commit] r47233 - /tags/stable-2_16_43/packager/
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:28:18 2008 New Revision: 47233 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47233&view=rev
Log: Created tag stable-2_16_43 for packager Added: tags/stable-2_16_43/packager/ - copied from r47232, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47232 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_packages.ycp src/clients/sw_single.ycp
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:28:14 2008 New Revision: 47232 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47232&view=rev
Log: - don't show "Repository" menu in the package manager during installation (bnc#381956) - 2.16.43 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_packages.ycp trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/VERSION URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47232&r1=47…
============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Apr 30 15:28:14 2008 @@ -1 +1 @@ -2.16.42 +2.16.43 Modified: trunk/packager/package/yast2-packager.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.…
============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 30 15:28:14 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 30 15:23:38 CEST 2008 - lslezak(a)suse.cz + +- don't show "Repository" menu in the package manager during + installation (bnc#381956) +- 2.16.43 + +------------------------------------------------------------------- Tue Apr 29 17:00:06 CEST 2008 - locilka(a)suse.cz - Calling inst_extrasources in pkg_finish to get default Modified: trunk/packager/src/clients/inst_packages.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_packag…
============================================================================== --- trunk/packager/src/clients/inst_packages.ycp (original) +++ trunk/packager/src/clients/inst_packages.ycp Wed Apr 30 15:28:14 2008 @@ -22,7 +22,7 @@ * * Returns `accept or `cancel . **/ - symbol detailedSelection( symbol mode ) + symbol detailedSelection( symbol mode, boolean enable_repo_mgr ) { // Open an empty dialog for immediate feedback UI::OpenDialog(`opt(`defaultsize), @@ -35,8 +35,15 @@ // while the package manager is initialized UI::ReplaceWidget(`rep, mode == nil ? - `PackageSelector(`id(`packages ), "") : - `PackageSelector(`id(`packages ), `opt(mode), "") + (enable_repo_mgr ? + `PackageSelector(`id(`packages), `opt(`repoMgr), "") + : `PackageSelector(`id(`packages), "") + ) : + + (enable_repo_mgr ? + `PackageSelector(`id(`packages ), `opt(mode, `repoMgr), "") + : `PackageSelector(`id(`packages ), `opt(mode), "") + ) ); symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); @@ -57,7 +64,7 @@ if ( ! UI::HasSpecialWidget(`PatternSelector ) || UI::WizardCommand(`Ping() ) != true ) { - return detailedSelection( nil ); // Fallback: detailed selection + return detailedSelection( nil, !Stage::initial() ); // Fallback: detailed selection } // Help text for software patterns / selections dialog @@ -112,7 +119,7 @@ if ( result == `details ) { - result = detailedSelection( nil ); + result = detailedSelection( nil, !Stage::initial() ); if ( result == `cancel ) // don't get all the way out - the user might just have @@ -151,11 +158,18 @@ symbol mode = (symbol) WFM::Args(0); y2milestone( "inst_packages called with: %1" , mode ); - result = detailedSelection( mode ); + boolean repo_mgr = false; + + if (size(WFM::Args()) > 1 && is( WFM::Args(1), symbol)) + { + repo_mgr = WFM::Args(1) == `repoMgr; + } + + result = detailedSelection( mode , repo_mgr ); } else { - result = detailedSelection( `searchMode ); + result = detailedSelection( `searchMode, false ); } } Modified: trunk/packager/src/clients/sw_single.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.y…
============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Apr 30 15:28:14 2008 @@ -383,7 +383,7 @@ // names of taboo packages list<string> taboo_packages = Pkg::GetPackages(`taboo, true); - result = (symbol)WFM::CallFunction( "inst_packages", []); // No: ask user via package selection widget + result = (symbol)WFM::CallFunction( "inst_packages", [`searchMode, `repoMgr]); // No: ask user via package selection widget y2milestone ("inst_packages returns %1", result); if (result == `accept) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47231 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPackageSelector.cc
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:22:25 2008 New Revision: 47231 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47231&view=rev
Log: - display "Repository" menu only when requested by `opt(`repoMgr) opiton (bnc#381956) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan…
============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Apr 30 15:22:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 15:21:09 CEST 2008 - lslezak(a)suse.cz + +- display "Repository" menu only when requested by `opt(`repoMgr) + opiton (bnc#381956) + +------------------------------------------------------------------- Fri Apr 25 12:14:45 CEST 2008 - dmacvicar(a)suse.de - make rpm groups view use packagekit groups Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?…
============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Wed Apr 30 15:22:25 2008 @@ -727,12 +727,18 @@ _patchList->addAllInListSubMenu( _patchMenu ); } - // Repository menu - _repositoryMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _repositoryMenu ); - action = _menuBar->addMenu( _repositoryMenu ); - action->setText(_( "&Repositories" )); - _repositoryMenu->addAction( _( "Repository &Manager..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_M ); + // add repository menu if requested + if (repoMgrEnabled()) + { + yuiDebug() << "Adding the repo manager menu" << std::endl; + + // Repository menu + _repositoryMenu = new QMenu( _menuBar ); + Q_CHECK_PTR( _repositoryMenu ); + action = _menuBar->addMenu( _repositoryMenu ); + action->setText(_( "&Repositories" )); + _repositoryMenu->addAction( _( "Repository &Manager..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_M ); + } // // Extras menu -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47230 - /tags/stable-2_16_46/ycp-ui-bindings/
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:18:41 2008 New Revision: 47230 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47230&view=rev
Log: Created tag stable-2_16_46 for ycp-ui-bindings Added: tags/stable-2_16_46/ycp-ui-bindings/ - copied from r47229, trunk/ycp-ui-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47229 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPDialogParser.cc yast2-ycp-ui-bindings.spec.in
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:18:32 2008 New Revision: 47229 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47229&view=rev
Log: - added support for `repoMgr option in YCPDialogParser::parsePackageSelector() to make the repository management optional (bnc#381956) - V 2.16.46 Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPDialogParser.cc trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/ycp-ui-bindings/VERSION URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=4722…
============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Wed Apr 30 15:18:32 2008 @@ -1 +1 @@ -2.16.45 +2.16.46 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-yc…
============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Wed Apr 30 15:18:32 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Apr 30 15:08:14 CEST 2008 - lslezak(a)suse.cz + +- added support for `repoMgr option in + YCPDialogParser::parsePackageSelector() to make the repository + management optional (bnc#381956) +- V 2.16.46 + +------------------------------------------------------------------- Wed Apr 16 12:27:51 CEST 2008 - sh(a)suse.de - Let YDialog take care of deleting events Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar…
============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Wed Apr 30 15:18:32 2008 @@ -2370,6 +2370,7 @@ * @option searchMode start with the "search" filter view * @option summaryMode start with the "installation summary" filter view * @option repoMode start with the "repositories" filter view + * @option repoMgr enable "Repository Manager" menu item * @usage `PackageSelector() * * @examples PackageSelector.ycp @@ -2421,6 +2422,7 @@ else if ( sym == YUIOpt_summaryMode ) modeFlags |= YPkg_SummaryMode; else if ( sym == YUIOpt_repoMode ) modeFlags |= YPkg_RepoMode; else if ( sym == YUIOpt_testMode ) modeFlags |= YPkg_TestMode; + else if ( sym == YUIOpt_repoMgr ) modeFlags |= YPkg_RepoMgr; else logUnknownOption( term, optList->value(o) ); } else logUnknownOption( term, optList->value(o) ); Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bin…
============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Wed Apr 30 15:18:32 2008 @@ -19,8 +19,9 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.16.45 -BuildRequires: yast2-libyui-devel >= 2.16.45 +# YUIOpt_repoMgr value +Requires: yast2-libyui >= 2.16.47 +BuildRequires: yast2-libyui-devel >= 2.16.47 # libyui ImplPtr BuildRequires: boost-devel -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47228 - /tags/stable-2_16_47/libyui/
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:15:51 2008 New Revision: 47228 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47228&view=rev
Log: Created tag stable-2_16_47 for libyui Added: tags/stable-2_16_47/libyui/ - copied from r47227, trunk/libyui/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47227 - in /trunk/libyui: VERSION package/yast2-libyui.changes src/YPackageSelector.h src/YUISymbols.h
by lslezak@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: lslezak Date: Wed Apr 30 15:15:46 2008 New Revision: 47227 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47227&view=rev
Log: - added repoMgrEnabled() method to YPackageSelector widget (repository management is now optional) (bnc#381956) - V 2.16.47 Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YPackageSelector.h trunk/libyui/src/YUISymbols.h Modified: trunk/libyui/VERSION URL:
http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=47227&r1=4722…
============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Wed Apr 30 15:15:46 2008 @@ -1 +1 @@ -2.16.46 +2.16.47 Modified: trunk/libyui/package/yast2-libyui.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan…
============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Wed Apr 30 15:15:46 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 30 14:50:36 CEST 2008 - lslezak(a)suse.cz + +- added repoMgrEnabled() method to YPackageSelector widget + (repository management is now optional) (bnc#381956) +- V 2.16.47 + +------------------------------------------------------------------- Wed Apr 23 15:57:16 CEST 2008 - sh(a)suse.de - Fixed segfault when discarding events from foreign dialogs Modified: trunk/libyui/src/YPackageSelector.h URL:
http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YPackageSelector.h?re…
============================================================================== --- trunk/libyui/src/YPackageSelector.h (original) +++ trunk/libyui/src/YPackageSelector.h Wed Apr 30 15:15:46 2008 @@ -28,6 +28,8 @@ #define YPkg_SummaryMode 1 << 4 #define YPkg_RepoMode 1 << 5 +#define YPkg_RepoMgr 1 << 15 + class YPackageSelector : public YWidget { @@ -57,6 +59,8 @@ bool summaryMode() const { return _modeFlags & YPkg_SummaryMode; } bool repoMode() const { return _modeFlags & YPkg_RepoMode; } + bool repoMgrEnabled() const { return _modeFlags & YPkg_RepoMgr; } + protected: long _modeFlags; }; Modified: trunk/libyui/src/YUISymbols.h URL:
http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YUISymbols.h?rev=4722…
============================================================================== --- trunk/libyui/src/YUISymbols.h (original) +++ trunk/libyui/src/YUISymbols.h Wed Apr 30 15:15:46 2008 @@ -210,6 +210,7 @@ #define YUIOpt_outputField "outputField" #define YUIOpt_plainText "plainText" #define YUIOpt_repoMode "repoMode" +#define YUIOpt_repoMgr "repoMgr" #define YUIOpt_scaleToFit "scaleToFit" #define YUIOpt_searchMode "searchMode" #define YUIOpt_shrinkable "shrinkable" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47226 - /tags/stable-2_16_8/ntp-client/
by mvidner@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: mvidner Date: Wed Apr 30 15:03:02 2008 New Revision: 47226 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47226&view=rev
Log: Created tag stable-2_16_8 for ntp-client Added: tags/stable-2_16_8/ntp-client/ - copied from r47225, trunk/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47225 - in /trunk/ntp-client: VERSION package/yast2-ntp-client.changes
by mvidner@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: mvidner Date: Wed Apr 30 14:58:17 2008 New Revision: 47225 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47225&view=rev
Log: bump Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/VERSION URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=47225&r1=…
============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Wed Apr 30 14:58:17 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli…
============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Wed Apr 30 14:58:17 2008 @@ -6,6 +6,7 @@ for compatibility (bnc#381838). - Avoid "UI syntax error" when Write is called from the timezone module (bnc#384715). +- 2.16.8 ------------------------------------------------------------------- Wed Apr 16 10:45:26 CEST 2008 - mvidner(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r47224 - in /trunk/ntp-client: package/ src/ testsuite/tests/
by mvidner@svn.opensuse.org
30 Apr '08
30 Apr '08
Author: mvidner Date: Wed Apr 30 14:17:01 2008 New Revision: 47224 URL:
http://svn.opensuse.org/viewcvs/yast?rev=47224&view=rev
Log: /etc/sysconfig/ntp:NTPD_INITIAL_NTPDATE was removed and assumes AUTO now. Removed the UI related to it, but keet CLI and AutoYaST options for compatibility (bnc#381838). Modified: trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/NtpClient.ycp trunk/ntp-client/src/commandline.ycp trunk/ntp-client/src/helps.ycp trunk/ntp-client/src/ntpclient.rnc trunk/ntp-client/src/widgets.ycp trunk/ntp-client/testsuite/tests/Read.out trunk/ntp-client/testsuite/tests/Read.ycp trunk/ntp-client/testsuite/tests/Write.out trunk/ntp-client/testsuite/tests/Write.ycp Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli…
============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Wed Apr 30 14:17:01 2008 @@ -1,6 +1,9 @@ ------------------------------------------------------------------- -Wed Apr 30 11:10:27 CEST 2008 - mvidner(a)suse.cz +Wed Apr 30 14:16:39 CEST 2008 - mvidner(a)suse.cz +- /etc/sysconfig/ntp:NTPD_INITIAL_NTPDATE was removed and assumes AUTO + now. Removed the UI related to it, but keet CLI and AutoYaST options + for compatibility (bnc#381838). - Avoid "UI syntax error" when Write is called from the timezone module (bnc#384715). Modified: trunk/ntp-client/src/NtpClient.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev…
============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Wed Apr 30 14:17:01 2008 @@ -474,48 +474,13 @@ failed = true; ProcessNtpConf(); - run_chroot = SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED) == "yes"; + string run_chroot_s = (string) SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED); + run_chroot = run_chroot_s == "yes"; - string initial_sync = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE); - if (initial_sync == nil) + if (run_chroot_s == nil) { - initial_sync = ""; failed = true; - y2error ("Failed reading .sysconfig.ntp.NTPD_INITIAL_NTPDATE"); - } - - // mark those servers and peers that are used for initial syncing - if (initial_sync == "AUTO") - { - ntp_records = maplist (map<string,any> p, ntp_records, ``{ - p["initial_sync"] = p["type"]:"" == "server"; - return p; - }); - } - else if (regexpmatch (initial_sync, "AUTO-[0-9]+")) - { - integer count = tointeger ( - regexpsub (initial_sync, "AUTO-([0-9]+)", "\\1")); - ntp_records = maplist (map<string,any> p, ntp_records, ``{ - if (p["type"]:"" == "server" || p["type"]:"" == "peer") - { - count = count - 1; - p["initial_sync"] = count >= 0; - } - else - p["initial_sync"] = false; - return p; - }); - } - else - { - list listed = splitstring (initial_sync, " "); - ntp_records = maplist (map<string,any> p, ntp_records, ``{ - p["initial_sync"] - = (p["type"]:"" == "server" || p["type"]:"" == "peer") - && contains (listed, p["address"]:""); - return p; - }); + y2error ("Failed reading .sysconfig.ntp.NTPD_RUN_CHROOTED"); } if(failed) @@ -621,7 +586,6 @@ string one_address = one_record["address"]:""; store_current_options[one_address] = $[]; store_current_options[one_address, "options"] = one_record["options"]:""; - store_current_options[one_address, "initial_sync"] = one_record["initial_sync"]:true; } }); @@ -636,20 +600,17 @@ }); foreach (string one_server, random_pool_servers, { - boolean one_initial_sync = true; string one_options = ""; if (haskey(store_current_options, one_server)) { - one_initial_sync = store_current_options[one_server, "initial_sync"]:true; one_options = store_current_options[one_server, "options"]:""; - y2milestone("Leaving current configuration for server '%1', initial_sync: '%2', options '%3'", - one_server, one_initial_sync, one_options); + y2milestone("Leaving current configuration for server '%1', options '%2'", + one_server, one_options); } ntp_records = add (ntp_records, $[ "address":one_server, "comment":"\n# Random pool server, see
http://www.pool.ntp.org/
for more information\n", - "initial_sync":one_initial_sync, "options":one_options, "type":"server" ]); @@ -785,32 +746,10 @@ Service::RunInitScript ("network", "restart-all-dhcp-clients"); } - list init = maplist (map<string,any> p, ntp_records, ``( - (p["type"]:"" == "server" || p["type"]:"" == "peer") - && p["initial_sync"]:false - ? p["address"]:"" - : nil - )); - init = filter (any i, init, ``(i != nil)); - string init_str = mergestring ((list<string>)init, " "); - - // if DHCLIENT_MODIFY_NTP_CONF, NTPD_INITIAL = AUTO - if (config_dhcp) { - init_str = "AUTO"; - // Don't remove the AUTO key, something should be present for initialization - // if there is no NTP server set explicitly - } else if (size (init) == 0) { - string orig_init = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE); - if (orig_init == "AUTO" || substring (orig_init, 0, 5) == "AUTO-") { - init_str = orig_init; - } - } - if (! (SCR::Write (.sysconfig.ntp.NTPD_RUN_CHROOTED, run_chroot ? "yes" : "no") - && SCR::Write (.sysconfig.ntp.NTPD_INITIAL_NTPDATE, init_str) - && SCR::Write (.sysconfig.ntp, nil))) + && SCR::Write (.sysconfig.ntp, nil))) { // error report Report::Error (_("Cannot write sysconfig variables.")); @@ -877,8 +816,6 @@ { p["type"] = p["key"]:""; p["address"] = p["value"]:""; - if (haskey (p, "initial")) - p["initial_sync"] = p["initial"]:false; if (haskey (p, "param")) p["options"] = p["param"]:""; return (p); Modified: trunk/ntp-client/src/commandline.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/commandline.ycp?r…
============================================================================== --- trunk/ntp-client/src/commandline.ycp (original) +++ trunk/ntp-client/src/commandline.ycp Wed Apr 30 14:17:01 2008 @@ -77,9 +77,9 @@ if (haskey (options, "fudge")) NtpClient::selected_record["fudge_options"] = options["fudge"]:""; if (haskey (options, "initial")) - NtpClient::selected_record["initial_sync"] = true; + y2warning ("option 'initial' is obsolete"); if (haskey (options, "no-initial")) - NtpClient::selected_record["initial_sync"] = false; + y2warning ("option 'no-initial' is obsolete"); return NtpClient::storeSyncRecord (); } @@ -283,14 +283,6 @@ "help" : _("Options for clock driver calibration"), "type" : "string", ], - "initial" : $[ - // command line help text for an option - "help" : _("Use the server for initial synchronization"), - ], - "no-initial" : $[ - // command line help text for an option - "help" : _("Do not use the server for initial synchronization"), - ], ], "mappings" : $[ Modified: trunk/ntp-client/src/helps.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/helps.ycp?rev=472…
============================================================================== --- trunk/ntp-client/src/helps.ycp (original) +++ trunk/ntp-client/src/helps.ycp Wed Apr 30 14:17:01 2008 @@ -130,11 +130,7 @@ To set the address from which to accept broadcast packets, use <b>Address</b>.</p>"), - // help text 2/4, optinal - "init_sync" : _("<p><b><big>Initial Synchronization</big></b><br> -The first synchronization of the clock is performed before the NTP daemon is -started. To use this host for initial synchronization, select -<b>Use for Initial Synchronization</b>.</p>"), + // help text 2/4, was removed // help text 3/4, optional "options" : _("<p><b><big>Options</big></b><br> Modified: trunk/ntp-client/src/ntpclient.rnc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntpclient.rnc?rev…
============================================================================== --- trunk/ntp-client/src/ntpclient.rnc (original) +++ trunk/ntp-client/src/ntpclient.rnc Wed Apr 30 14:17:01 2008 @@ -10,6 +10,7 @@ element create_symlink { BOOLEAN } configure_dhcp = element configure_dhcp { BOOLEAN } +# ignored since 2.16.8 initial_sync = element initial_sync { BOOLEAN } fudge_comment = element fudge_comment { text } Modified: trunk/ntp-client/src/widgets.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/widgets.ycp?rev=4…
============================================================================== --- trunk/ntp-client/src/widgets.ycp (original) +++ trunk/ntp-client/src/widgets.ycp Wed Apr 30 14:17:01 2008 @@ -231,7 +231,6 @@ y2milestone("The currently selected server is the same as when starting the module..."); } else { NtpClient::selected_record["type"] = "server"; - NtpClient::selected_record["initial_sync"] = true; y2milestone("Storing the current address record: %1", NtpClient::selected_record); NtpClient::storeSyncRecord(); } @@ -575,7 +574,6 @@ { y2milestone("Storing the server address in simple configuration"); NtpClient::selected_record["type"] = "server"; - NtpClient::selected_record["initial_sync"] = true; } } } @@ -651,26 +649,6 @@ * Initialize the widget * @param id any widget id */ -define void initSyncInit (string id) ``{ - y2milestone("Selected %1", NtpClient::selected_record); - UI::ChangeWidget (`id ("init_sync"), `Value, - NtpClient::selected_record["initial_sync"]:false); -} - -/** - * Store settings of the widget - * @param id any widget id - * @param event map event that caused storing process - */ -define void initSyncStore (string id, map event) ``{ - NtpClient::selected_record["initial_sync"] - = UI::QueryWidget (`id ("init_sync"), `Value); -} - -/** - * Initialize the widget - * @param id any widget id - */ define void optionsInit (string id) ``{ UI::ChangeWidget (`id ("options"), `Value, NtpClient::selected_record["options"]:""); } @@ -1367,14 +1345,6 @@ "handle" : browseButtonHandle, "help" : " ", ], - "init_sync" : $[ - "widget" : `checkbox, - // checkbox - "label" : _("Use for &Initial Synchronization"), - "init" : initSyncInit, - "store" : initSyncStore, - "help" : HELPS["init_sync"]:"", - ], "options" : $[ "widget" : `textentry, // text entry label Modified: trunk/ntp-client/testsuite/tests/Read.out URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/testsuite/tests/Read.…
============================================================================== --- trunk/ntp-client/testsuite/tests/Read.out (original) +++ trunk/ntp-client/testsuite/tests/Read.out Wed Apr 30 14:17:01 2008 @@ -7,6 +7,5 @@ Read .target.ycp "/var/lib/YaST2/ad_ntp_data.ycp" nil Read .etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[$["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp1 options1"], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"127.127.1.2 options_clock"], $["comment":"", "kind":"value", "name":"fudge", "type":0, "value":"127.127.1.2fudge_clock"], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp2 options2"], $["comment":"", "kind":"value", "name":"peer", "type":0, "value":"peer1 options_peer"]]] Read .sysconfig.ntp.NTPD_RUN_CHROOTED "yes" -Read .sysconfig.ntp.NTPD_INITIAL_NTPDATE "AUTO-2" Return true -Return $["configure_dhcp":false, "peers":[$["address":"ntp1", "comment":"", "initial_sync":true, "options":" options1", "type":"server"], $["address":"127.127.1.2", "comment":"", "initial_sync":false, "options":" options_clock", "type":"__clock"], $["address":"ntp2", "comment":"", "initial_sync":true, "options":" options2", "type":"server"], $["address":"peer1", "comment":"", "initial_sync":false, "options":" options_peer", "type":"peer"]], "start_at_boot":false, "start_in_chroot":true] +Return $["configure_dhcp":false, "peers":[$["address":"ntp1", "comment":"", "options":" options1", "type":"server"], $["address":"127.127.1.2", "comment":"", "options":" options_clock", "type":"__clock"], $["address":"ntp2", "comment":"", "options":" options2", "type":"server"], $["address":"peer1", "comment":"", "options":" options_peer", "type":"peer"]], "start_at_boot":false, "start_in_chroot":true] Modified: trunk/ntp-client/testsuite/tests/Read.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/testsuite/tests/Read.…
============================================================================== --- trunk/ntp-client/testsuite/tests/Read.ycp (original) +++ trunk/ntp-client/testsuite/tests/Read.ycp Wed Apr 30 14:17:01 2008 @@ -78,7 +78,6 @@ ], "sysconfig" : $[ "ntp" : $[ - "NTPD_INITIAL_NTPDATE" : "AUTO-2", "NTPD_RUN_CHROOTED" : "yes", ], "personal-firewall" : $[ Modified: trunk/ntp-client/testsuite/tests/Write.out URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/testsuite/tests/Write…
============================================================================== --- trunk/ntp-client/testsuite/tests/Write.out (original) +++ trunk/ntp-client/testsuite/tests/Write.out Wed Apr 30 14:17:01 2008 @@ -6,6 +6,5 @@ Write .etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[$["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp1 options1"], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"127.127.1.2 options_clock"], $["comment":"", "kind":"value", "name":"fudge", "type":0, "value":"127.127.1.2 "], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp2 options2"], $["comment":"", "kind":"value", "name":"peer", "type":0, "value":"peer1 options_peer"]]] true Write .etc.ntp_conf nil true Write .sysconfig.ntp.NTPD_RUN_CHROOTED "yes" true -Write .sysconfig.ntp.NTPD_INITIAL_NTPDATE "ntp1 ntp2" true Write .sysconfig.ntp nil true Return true Modified: trunk/ntp-client/testsuite/tests/Write.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/testsuite/tests/Write…
============================================================================== --- trunk/ntp-client/testsuite/tests/Write.ycp (original) +++ trunk/ntp-client/testsuite/tests/Write.ycp Wed Apr 30 14:17:01 2008 @@ -41,7 +41,6 @@ ], "sysconfig" : $[ "ntp" : $[ - "NTPD_INITIAL_NTPDATE" : "AUTO-2", "NTPD_RUN_CHROOTED" : "yes", ], "personal-firewall" : $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
← Newer
1
2
3
4
5
...
134
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
Results per page:
10
25
50
100
200