October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41682 - /branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 14:04:49 2007 New Revision: 41682 URL: http://svn.opensuse.org/viewcvs/yast?rev=41682&view=rev Log: add _header.assign( ) in setHeader() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Wed Oct 31 14:04:49 2007 @@ -127,12 +127,8 @@ void NCTable::setHeader( int col, const string & text ) { - //YTable::setHeader( col, text ); + _header[ col ] += NCstring( text ) ; - if ( hasColumn( col )) - { - _header[ col ] += NCstring( text ) ; - } hasHeadline = myPad()->SetHeadline( _header ); } @@ -148,6 +144,7 @@ void NCTable::setHeader( vector<string> head ) { + _header.assign( head.size(), NCstring("") ); for (unsigned int i = 0; i < head.size(); i++) { setHeader( i, head[i] ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41681 - /tags/stable-2_16_1/ntp-client/
by kmachalkova＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: kmachalkova Date: Wed Oct 31 13:57:07 2007 New Revision: 41681 URL: http://svn.opensuse.org/viewcvs/yast?rev=41681&view=rev Log: Created tag stable-2_16_1 for ntp-client Added: tags/stable-2_16_1/ntp-client/ - copied from r41680, 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

[yast-commit] r41680 - in /trunk/ntp-client: VERSION package/yast2-ntp-client.changes src/ntp-client_proposal.ycp
by kmachalkova＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: kmachalkova Date: Wed Oct 31 13:56:58 2007 New Revision: 41680 URL: http://svn.opensuse.org/viewcvs/yast?rev=41680&view=rev Log: - Prompt for installing xntp package (CheckAndInstallPackages) on running system, do not scan repositories (Package::Available()) (#327336) Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=41680&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Wed Oct 31 13:56:58 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 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 Oct 31 13:56:58 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Oct 31 13:53:04 CET 2007 - kmachalkova(a)suse.cz + +- Prompt for installing xntp package (CheckAndInstallPackages) on + running system, do not scan repositories (Package::Available()) + (#327336) + - 2.16.1 + +------------------------------------------------------------------- Wed Oct 3 18:44:06 CEST 2007 - kmachalkova(a)suse.cz - Added visual progress feedback for running ntpdate in installation Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Wed Oct 31 13:56:58 2007 @@ -16,8 +16,10 @@ import "Stage"; import "Package"; import "Packages"; +import "PackageSystem"; import "Pkg"; import "Popup"; +import "Report"; y2milestone("----------------------------------------"); y2milestone("Ntp client proposal started"); @@ -153,8 +155,29 @@ ret = `invalid_hostname; else { - Popup::ShowFeedback("", _("Synchronizing with NTP server...")); - y2milestone("Running ntpdate to sync with %1", ntp_server); + string required_package = "xntp"; + + //In 1st stage, schedule packages for installation + if (Stage::initial()) + { + if (Package::Available(required_package)) + { + Packages::addAdditionalPackage(required_package); + // bugzilla #327050 + // Agent for writing /etc/ntp.conf needs to be installed + // to write the settings at the end of the installation + Packages::addAdditionalPackage("yast2-ntp-client"); + } + } + //Otherwise, prompt user for confirming pkg installation + else + { + if (!PackageSystem::CheckAndInstallPackages([ required_package ])) + { + Report::Error(sformat( _("Synchronization with NTP server is not possible +without having package %1 installed"), required_package)); + } + } integer status = -1; string service_name = "ntp"; @@ -169,19 +192,11 @@ Service::Stop (service_name); } - //Schedule package for installation - if (Package::Available("xntp")) - // FIXME: later use - // if (Package::Available("xntp")) { Packages::addAdditionalPackage("xntp"); } - Packages::addAdditionalPackage("xntp"); - // bugzilla #327050 - // Agent for writing /etc/ntp.conf needs to be installed - // to write the settings at the end of the installation - Packages::addAdditionalPackage("yast2-ntp-client"); + Popup::ShowFeedback("", _("Synchronizing with NTP server...")); + y2milestone("Running ntpdate to sync with %1", ntp_server); integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); y2milestone ("'ntpdate %1' returned %2", ntp_server, r); - Popup::ClearFeedback(); if( !Stage::initial()) { @@ -196,7 +211,9 @@ AddSingleServer(ntp_server); } else - ret = `ntpdate_failed; + ret = `ntpdate_failed; + + Popup::ClearFeedback(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41679 - in /branches/tmp/sh/mod-ui/ncurses/src: NCFileSelection.cc NCPackageSelectorPlugin.cc NCPkgTable.cc NCPkgTable.h pkg/NCPkgPopupDescr.cc pkg/NCPkgPopupSelection.cc pkg/NCPkgPopupTable.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 13:39:59 2007 New Revision: 41679 URL: http://svn.opensuse.org/viewcvs/yast?rev=41679&view=rev Log: add YTableHeader to NCPkgTable constructor Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCF… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc Wed Oct 31 13:39:59 2007 @@ -638,6 +638,7 @@ list<string> tmpList; list<string>::iterator it; + // FIXME - set the new header //fillHeader(); // create the column headers DIR * diskDir = opendir( currentDir.c_str() ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Wed Oct 31 13:39:59 2007 @@ -92,12 +92,14 @@ YWidget * NCPackageSelectorPlugin::createPkgSpecial( YWidget *parent, const string &subwidget ) { YWidget * w = 0; + YTableHeader * tableHeader = new YTableHeader(); + if ( subwidget == "pkgTable" ) { NCDBG << "Creating a NCPkgTable" << endl; try { - w = new NCPkgTable( parent ); + w = new NCPkgTable( parent, tableHeader ); } catch (const std::exception & e) { Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc Wed Oct 31 13:39:59 2007 @@ -113,8 +113,8 @@ // // DESCRIPTION : // -NCPkgTable::NCPkgTable( YWidget * parent ) - : NCTable( parent, 0 ) +NCPkgTable::NCPkgTable( YWidget * parent, YTableHeader * tableHeader ) + : NCTable( parent, tableHeader ) , packager ( 0 ) , statusStrategy( new PackageStatStrategy ) // default strategy: packages , tableType ( T_Packages ) // default type: packages Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h Wed Oct 31 13:39:59 2007 @@ -135,7 +135,7 @@ /** * Constructor */ - NCPkgTable( YWidget * parent ); + NCPkgTable( YWidget * parent, YTableHeader * tableHeader ); virtual ~NCPkgTable(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc Wed Oct 31 13:39:59 2007 @@ -100,8 +100,10 @@ //split->addChild( new NCSpacing( split, opt, 0.6, false, true ) ); new NCSpacing( split, YD_VERT, true, 0.6 ); // stretchable = true + YTableHeader * tableHeader = new YTableHeader(); + // add the package table (use default type T_Packages) - pkgTable = new NCPkgTable( split ); + pkgTable = new NCPkgTable( split, tableHeader ); pkgTable->setPackager( packager ); pkgTable->fillHeader(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc Wed Oct 31 13:39:59 2007 @@ -105,8 +105,10 @@ //NCLabel * head = new NCLabel( split, opt, label ); new NCLabel( split, label, true, false ); // isHeading = true + YTableHeader * tableHeader = new YTableHeader(); + // add the selection list - sel = new NCPkgTable( split ); + sel = new NCPkgTable( split, tableHeader ); sel->setPackager( packager ); // set status strategy NCPkgStatusStrategy * strat = new SelectionStatStrategy(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc Wed Oct 31 13:39:59 2007 @@ -103,9 +103,10 @@ //NCLabel * lb2 = new NCLabel( split, opt, YCPString(NCPkgNames::AutoChangeText2()) ); // text part2 of popup with automatic changes new NCLabel( split, _( "packages have been changed to resolve dependencies:" ), false, false ); - + + YTableHeader * tableHeader = new YTableHeader(); // add the package table (use default type T_Packages) - pkgTable = new NCPkgTable( split ); + pkgTable = new NCPkgTable( split, tableHeader ); pkgTable->setPackager( packager ); pkgTable->fillHeader(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41678 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:39:02 2007 New Revision: 41678 URL: http://svn.opensuse.org/viewcvs/yast?rev=41678&view=rev Log: Created tag stable-2_16_0 for update Added: tags/stable-2_16_0/update/ - copied from r41677, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41677 - /trunk/update/src/clients/inst_update.ycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:38:53 2007 New Revision: 41677 URL: http://svn.opensuse.org/viewcvs/yast?rev=41677&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. Modified: trunk/update/src/clients/inst_update.ycp Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.y… ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Oct 31 13:38:53 2007 @@ -131,7 +131,7 @@ updates the existing software and installs all new features and benefits of the new <tt>%1</tt> version. The selection is based on the former predefined software selection.</p> -"), Update::updateVersion["show"]:""); +"), Installation::updateVersion["show"]:""); // help text for dialog "update options" 3/4 helptext = helptext + _("<p><b>Only Installed Packages:</b> This selection -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41676 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:36:49 2007 New Revision: 41676 URL: http://svn.opensuse.org/viewcvs/yast?rev=41676&view=rev Log: Err, one more :) Removed: tags/stable-2_16_0/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41675 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:34:54 2007 New Revision: 41675 URL: http://svn.opensuse.org/viewcvs/yast?rev=41675&view=rev Log: Created tag stable-2_16_0 for update Added: tags/stable-2_16_0/update/ - copied from r41674, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41674 - /trunk/update/testsuite/tests/Update_GetProductName.hiddenycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:34:36 2007 New Revision: 41674 URL: http://svn.opensuse.org/viewcvs/yast?rev=41674&view=rev Log: One more change (as the previos ones) Modified: trunk/update/testsuite/tests/Update_GetProductName.hiddenycp Modified: trunk/update/testsuite/tests/Update_GetProductName.hiddenycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/testsuite/tests/Update_Ge… ============================================================================== --- trunk/update/testsuite/tests/Update_GetProductName.hiddenycp (original) +++ trunk/update/testsuite/tests/Update_GetProductName.hiddenycp Wed Oct 31 13:34:36 2007 @@ -34,6 +34,7 @@ import "Update"; import "Mode"; + import "Installation"; Mode::SetTest("testsuite"); @@ -46,7 +47,7 @@ DUMP ("------------------------------------------------------------"); TEST (``(Update::GetProductName()), [READ, WRITE, EXEC], nil); DUMP (prd_string); - DUMP (Update::installedVersion); + DUMP (Installation::installedVersion); }); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41673 - in /trunk/update/src/clients: inst_update.ycp update_proposal.ycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:27:31 2007 New Revision: 41673 URL: http://svn.opensuse.org/viewcvs/yast?rev=41673&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. Modified: trunk/update/src/clients/inst_update.ycp trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.y… ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Oct 31 13:27:31 2007 @@ -20,7 +20,7 @@ import "RootPart"; import "Update"; import "Packages"; - + import "Installation"; // screen title for update options string title = _("Update Options"); @@ -69,8 +69,8 @@ // Build and show dialog - string from_version = Update::installedVersion["show"]:_("Unknown"); - string to_version = Update::updateVersion["show"]:_("Unknown"); + string from_version = Installation::installedVersion["show"]:_("Unknown"); + string to_version = Installation::updateVersion["show"]:_("Unknown"); string update_label = ""; if (from_version == to_version) { Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Oct 31 13:27:31 2007 @@ -448,22 +448,22 @@ // TRANSLATORS: unknown product (label) string update_from = _("Unknown product"); - if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { - update_from = Update::installedVersion["show"]:""; - } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { - update_from = Update::installedVersion["name"]:""; + if (Installation::installedVersion["show"]:"" != "" && Installation::installedVersion["show"]:"?" != "?") { + update_from = Installation::installedVersion["show"]:""; + } else if (Installation::installedVersion["version"]:"" != "" && Installation::installedVersion["version"]:"?" != "?") { + update_from = Installation::installedVersion["name"]:""; } // TRANSLATORS: unknown product (label) string update_to = _("Unknown product"); - if (Update::updateVersion["show"]:"" != "") { - update_to = Update::updateVersion["show"]:""; - } else if (Update::updateVersion["version"]:"" != "") { - update_to = Update::updateVersion["name"]:""; + if (Installation::updateVersion["show"]:"" != "") { + update_to = Installation::updateVersion["show"]:""; + } else if (Installation::updateVersion["version"]:"" != "") { + update_to = Installation::updateVersion["name"]:""; } // when versions don't match and upgrade is not allowed (running system) - if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { + if ((Installation::installedVersion["version"]:"A" != Installation::updateVersion["version"]:"B") && Update::disallow_upgrade) { return $[ "warning" : sformat( // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed @@ -479,14 +479,14 @@ string warning_message = nil; // when labels don't match - if (!Stage::initial() && (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B")) { + if (!Stage::initial() && (Installation::installedVersion["show"]:"A" != Installation::updateVersion["show"]:"B")) { warning_message = sformat( // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names _("Warning: Updating from '%1' to '%2', products do not exactly match."), // TRANSLATORS: unknown product name - Update::installedVersion["show"]:_("Unknown product"), + Installation::installedVersion["show"]:_("Unknown product"), // TRANSLATORS: unknown product name - Update::updateVersion["show"]:_("Unknown product") + Installation::updateVersion["show"]:_("Unknown product") ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0