April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r47033 - in /trunk/country: VERSION package/yast2-country.changes timezone/data/timezone_raw.ycp
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 14:20:48 2008 New Revision: 47033 URL: http://svn.opensuse.org/viewcvs/yast?rev=47033&view=rev Log: - new/renamed time zones: San_Luis, Ho_Chi_Minh - 2.16.19 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/data/timezone_raw.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=47033&r1=470… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Apr 24 14:20:48 2008 @@ -1 +1 @@ -2.16.18 +2.16.19 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Apr 24 14:20:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 24 13:59:47 CEST 2008 - jsuchome(a)suse.cz + +- new/renamed time zones: San_Luis, Ho_Chi_Minh +- 2.16.19 + +------------------------------------------------------------------- Mon Apr 21 11:05:40 CEST 2008 - jsuchome(a)suse.cz - removed the feature with selecting region's "central zone" Modified: trunk/country/timezone/data/timezone_raw.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/data/timezone_r… ============================================================================== --- trunk/country/timezone/data/timezone_raw.ycp (original) +++ trunk/country/timezone/data/timezone_raw.ycp Thu Apr 24 14:20:48 2008 @@ -259,6 +259,8 @@ // time zone "America/Argentina/San_Juan" : _("San Juan"), // time zone + "America/Argentina/San_Luis" : _("San Luis"), + // time zone "America/Argentina/Tucuman" : _("Tucuman"), // time zone "America/Argentina/Ushuaia" : _("Ushuaia"), @@ -582,7 +584,7 @@ // time zone "Asia/Rangoon" : _("Myanmar"), // time zone - "Asia/Saigon" : _("Saigon"), + "Asia/Ho_Chi_Minh" : _("Saigon"), // time zone "Asia/Sakhalin" : _("Sakhalin"), // time zone -- 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] r47032 - /tags/branch-SLE-10-SP2-2_13_67/online-update/
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:41:11 2008 New Revision: 47032 URL: http://svn.opensuse.org/viewcvs/yast?rev=47032&view=rev Log: Created tag branch-SLE-10-SP2-2_13_67 for online-update Added: tags/branch-SLE-10-SP2-2_13_67/online-update/ - copied from r47031, branches/SuSE-SLE-10-SP2-Branch/online-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] r47031 - /tags/branch-SLE-10-SP2-2_13_67/
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:41:09 2008 New Revision: 47031 URL: http://svn.opensuse.org/viewcvs/yast?rev=47031&view=rev Log: Created tag branch-SLE-10-SP2-2_13_67 Added: tags/branch-SLE-10-SP2-2_13_67/ -- 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] r47030 - in /branches/SuSE-SLE-10-SP2-Branch/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:40:04 2008 New Revision: 47030 URL: http://svn.opensuse.org/viewcvs/yast?rev=47030&view=rev Log: - Patch CD: ensure first CD is in drive before synchronization with ZMD (bnc#381594) - 2.13.67 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION Thu Apr 24 13:40:04 2008 @@ -1 +1 @@ -2.13.66 +2.13.67 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes Thu Apr 24 13:40:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 13:20:54 CEST 2008 - jsuchome(a)suse.cz + +- Patch CD: ensure first CD is in drive before synchronization with + ZMD (bnc#381594) +- 2.13.67 + +------------------------------------------------------------------- Tue Apr 8 10:18:32 CEST 2008 - jsuchome(a)suse.cz - use y2logRPM for logging rpm output (bnc#372863) Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Thu Apr 24 13:40:04 2008 @@ -21,6 +21,7 @@ import "Popup"; import "Progress"; import "SourceManager"; + import "URL"; import "Wizard"; import "GetInstArgs"; @@ -196,6 +197,18 @@ break; } }); + if (add_new_source) + { + // now, ensure there's first CD in the drive (bnc#381594) + map parsed = URL::Parse (new_source["url"]:""); + if (parsed["scheme"]:"" == "cd") + { + // SourceProvideFile should use a callback to ask user for 1st media + if (Pkg::SourceProvideFile ( + OnlineUpdate::cd_source, 1, "/media.1/media") == nil) + add_new_source = false; + } + } if (add_new_source) { -- 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] r47029 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgFilterSearch.cc NCPkgMenuFilter.cc NCPkgMenuFilter.h NCPkgStrings.cc
by gs＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: gs Date: Thu Apr 24 13:30:20 2008 New Revision: 47029 URL: http://svn.opensuse.org/viewcvs/yast?rev=47029&view=rev Log: deprecated zypp::ui::PatchContents replaced, patch search enabled Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgMenuFilter.cc trunk/ncurses-pkg/src/NCPkgMenuFilter.h trunk/ncurses-pkg/src/NCPkgStrings.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Apr 24 13:30:20 2008 @@ -51,13 +51,12 @@ #include "NCZypp.h" // tryCastToZyppPkg(), tryCastToZyppPatch() #include <zypp/ui/Selectable.h> -#include <zypp/ui/PatchContents.h> #include "YWidgetID.h" #include "YPackageSelector.h" -typedef zypp::ui::PatchContents ZyppPatchContents; -typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator; +typedef zypp::Patch::Contents ZyppPatchContents; +typedef zypp::Patch::Contents::Selectable_iterator ZyppPatchContentsIterator; #include <ycp/Parser.h> #include "YEvent.h" @@ -262,20 +261,6 @@ return diff; } -string NCPackageSelector::getMenuId( YMenuItem *menuItem ) -{ - #if 0 - if ( menuItem ) - { - YCPMenuItem * ycpMenuItem = dynamic_cast<YCPMenuItem *> ( menuItem ); - - if ( ycpMenuItem ) - return ycpMenuItem->id()->toString(); - } - #endif - return ""; -} - /////////////////////////////////////////////////////////////////// // // handleEvent @@ -313,7 +298,6 @@ { if ( event.widget == actionMenu ) // change package/patch status - //retVal = StatusHandler( event ); retVal = actionMenu->handleEvent( event ); else if ( event.widget == viewMenu ) // show package/patch information @@ -363,11 +347,17 @@ if ( patchPtr ) { - //if ( match( (*listIt)->name(), expr, true ) ) - //{ + string name = patchPtr->name(); + + string::iterator pos = search( name.begin(), name.end(), + expr.begin(), expr.end(), + ic_compare ); + + if ( pos != name.end() ) + { // search sucessful packageList->createPatchEntry( patchPtr, *listIt ); - // } + } } ++listIt; } @@ -520,16 +510,16 @@ if ( !patchPtr ) return false; - ZyppPatchContents patchContents( patchPtr ); - - zypp::Patch::AtomList atomList = patchPtr->atoms(); - yuiMilestone() << "Filtering for patch: " << patchPtr->name().c_str() << " number of atoms: " << atomList.size() << endl ; + ZyppPatchContents patchContents( patchPtr->contents() ); + + yuiMilestone() << "Filtering for patch: " << patchPtr->name().c_str() << " number of atoms: " + << patchContents.size() << endl ; - for ( ZyppPatchContentsIterator it = patchContents.begin(); - it != patchContents.end(); + for ( ZyppPatchContentsIterator it = patchContents.selectableBegin(); + it != patchContents.selectableEnd(); ++it ) { - ZyppPkg pkg = tryCastToZyppPkg( *it ); + ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); if ( pkg ) { @@ -541,8 +531,8 @@ if ( inContainer( patchSelectables, sel ) ) { yuiMilestone() << "Suppressing duplicate selectable: " << (*it)->name().c_str() << "-" << - (*it)->edition().asString().c_str() << " " << - (*it)->arch().asString().c_str() << endl; + pkg->edition().asString().c_str() << " " << + pkg->arch().asString().c_str() << endl; } else { @@ -574,30 +564,12 @@ } } } - else // No ZyppPkg - some other kind of object (script, message) + else // No ZyppPkg - some other kind of object { - if ( zypp::isKind<zypp::Script> ( *it ) ) - { - vector<string> pkgLine; - pkgLine.reserve(4); + y2debug( "Found unknown atom of kind %s: %s", + (*it)->kind().asString().c_str(), + (*it)->name().c_str() ); - pkgLine.push_back( (*it)->name() ); - pkgLine.push_back( " " ); // versions empty - pkgLine.push_back( " " ); - pkgLine.push_back( NCPkgStrings::Script() ); - - pkgTable->addLine( S_NoInst, - pkgLine, - ZyppObj(), - ZyppSel() - ); - } - else - { - y2debug( "Found unknown atom of kind %s: %s", - (*it)->kind().asString().c_str(), - (*it)->name().c_str() ); - } } } @@ -633,61 +605,26 @@ { displayPatch = true; } - else if ( filter == "installed" ) - { - if ( selectable->hasInstalledObj() ) - displayPatch = true; - } - else if ( filter == "installable" ) + else if ( filter == "installed" ) // now means: satisfied { - if ( selectable->hasInstalledObj() ) // patch installed? - { - // display only if broken - if ( selectable->installedPoolItem().isBroken() ) - { - displayPatch = true; - yuiWarning() << "Installed patch is broken: " << patchPtr->name().c_str() << " - " - << patchPtr->summary().c_str() << endl; - } - } - else // patch not installed - + if ( selectable->hasCandidateObj() && + selectable->candidateObj().isRelevant() && + selectable->candidateObj().isSatisfied() ) { - if (selectable->hasCandidateObj() && - selectable->candidateObj().isSatisfied() ) - { - //patch not installed, but it is satisfied (updated to the version patch requires) - //all that is missing are patch metadata, so let's display the patch - - displayPatch = true; - - yuiMilestone() << "Patch satisfied, but not installed yet: " << patchPtr->name().c_str() << " - " - << patchPtr->summary().c_str() << endl; - } - } - - if (selectable->hasCandidateObj()) { - - // isNeeded(): this patch is relevant (contains updates for installed packages) - // isSatisfied(): all packages are installed, therefore the isNeeded() flag - // isn't set. BUT the patch meta data aren't installed and therefore it makes - // sense to install the patch - if ( selectable->candidateObj().status().isInstalled() - && selectable->candidateObj().isBroken()) - { displayPatch = true; - } - else - { - yuiMilestone() << "Patch not needed: " << patchPtr->name().c_str() << " - " - << patchPtr->summary().c_str() << endl; - } } } - else if ( filter == "new" ) + else if ( filter == "installable" ) // relevant patches { - if ( !selectable->hasInstalledObj() ) + // only shows patches relevant to the system + if ( selectable->hasCandidateObj() && + selectable->candidateObj().isRelevant() ) + { + // FIXME: Condition is relevant and broken ??? -> schubi + // and only those that are needed + if ( ! selectable->candidateObj().isSatisfied() ) displayPatch = true; + } } else if ( filter == "security" ) { @@ -705,11 +642,6 @@ if ( patchPtr->category() == "optional" ) displayPatch = true; } - else if ( filter == "YaST2" ) - { - if ( patchPtr->category() == "yast" ) - displayPatch = true; - } if ( displayPatch ) packageList->createPatchEntry( patchPtr, selectable ); @@ -1498,13 +1430,13 @@ if ( patch ) { - ZyppPatchContents patchContents( patch ); + ZyppPatchContents patchContents( patch->contents() ); - for ( ZyppPatchContentsIterator contents_it = patchContents.begin(); - contents_it != patchContents.end(); + for ( ZyppPatchContentsIterator contents_it = patchContents.selectableBegin(); + contents_it != patchContents.selectableEnd(); ++contents_it ) { - ZyppPkg pkg = tryCastToZyppPkg( *contents_it ); + ZyppPkg pkg = tryCastToZyppPkg( (*contents_it)->theObj() ); ZyppSel sel; if ( pkg ) Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Apr 24 13:30:20 2008 @@ -76,6 +76,11 @@ class NCMenuButton; class YReplacePoint; +inline bool ic_compare ( char c1, char c2 ) +{ + return ( toupper( c1 ) == toupper( c2 ) ); +} + /////////////////////////////////////////////////////////////////// // // CLASS NAME : NCPackageSelector @@ -164,10 +169,6 @@ set<string> verified_pkgs; - protected: - - string getMenuId( YMenuItem *menu ); - public: enum FilterMode { Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Thu Apr 24 13:30:20 2008 @@ -39,10 +39,7 @@ Textdomain "ncurses-pkg" */ -bool ic_compare ( char c1, char c2 ) -{ - return ( toupper( c1 ) == toupper( c2 ) ); -} + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses-pkg/src/NCPkgMenuFilter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuFilter.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuFilter.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuFilter.cc Thu Apr 24 13:30:20 2008 @@ -41,8 +41,10 @@ // menu items of the filter menu for patches - keep them short // and use unique hotkeys from begin: to end: // begin: - installable = new YMenuItem( _( "&Installable Patches" ) ); - installed = new YMenuItem( _( "Installed &Patches" ) ); + needed = new YMenuItem( _( "&Needed Patches" ) ); + // _( "Re&levant Patches") + satisfied = new YMenuItem( _( "&Satisfied Patches" ) ); + unneeded = new YMenuItem( _( "&Unneeded Patches" ) ); allPatches = new YMenuItem( _( "&All Patches" ) ); recommended = new YMenuItem( _( "&Recommended" ) ); security = new YMenuItem( _( "&Security" ) ); @@ -50,8 +52,8 @@ // end: search = new YMenuItem( _( "S&earch" ) ); - items.push_back( installable ); - items.push_back( installed ); + items.push_back( needed ); + items.push_back( satisfied ); items.push_back( allPatches ); items.push_back( recommended ); items.push_back( security ); @@ -83,9 +85,9 @@ // Call the appropriate method from NCPackageSelector for // the selected menu entry. - if ( event.selection == installable ) + if ( event.selection == needed ) pkg->fillPatchList( "installable" ); // show installed patches - else if ( event.selection == installed ) + else if ( event.selection == satisfied ) pkg->fillPatchList( "installed" ); // show installed patches else if ( event.selection == allPatches ) pkg->fillPatchList( "all" ); // show all patches Modified: trunk/ncurses-pkg/src/NCPkgMenuFilter.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuFilter.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuFilter.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuFilter.h Thu Apr 24 13:30:20 2008 @@ -42,8 +42,9 @@ YItemCollection items; - YMenuItem *installable; - YMenuItem *installed; + YMenuItem *needed; + YMenuItem *satisfied; + YMenuItem *unneeded; YMenuItem *allPatches; YMenuItem *recommended; YMenuItem *security; Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Thu Apr 24 13:30:20 2008 @@ -953,7 +953,9 @@ { // A label for a list of YOU Patches - keep it short - max 25 chars! // (the list shows all patches which can be installed) - static const string value = _( "Installable Patches" ); + //static const string value = _( "Installable Patches" ); + //static const string value = _( "Relevant Patches" ); + static const string value = _( "Needed Patches" ); return value; } @@ -961,7 +963,9 @@ { // A label for a list of YOU Patches - keep it short - max. 25 chars! // (the list shows all patches which are already installed) - static const string value = _( "Installed Patches" ); + //static const string value = _( "Installed Patches" ); + //static const string value = _( "Unneeded Patches" ); + static const string value = _( "Satisfied Patches" ); return value; } -- 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] r47028 - /tags/branch-SLE-10-SP2-2_13_15/cd-creator/
by lslezak＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: lslezak Date: Thu Apr 24 13:23:57 2008 New Revision: 47028 URL: http://svn.opensuse.org/viewcvs/yast?rev=47028&view=rev Log: Created tag branch-SLE-10-SP2-2_13_15 for cd-creator Added: tags/branch-SLE-10-SP2-2_13_15/cd-creator/ - copied from r47027, branches/SuSE-SLE-10-SP2-Branch/cd-creator/ -- 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] r47027 - in /branches/SuSE-SLE-10-SP2-Branch/cd-creator: VERSION package/yast2-cd-creator.changes src/CDCreator.ycp
by lslezak＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: lslezak Date: Thu Apr 24 13:23:51 2008 New Revision: 47027 URL: http://svn.opensuse.org/viewcvs/yast?rev=47027&view=rev Log: - add 'post-packages' from autoyast profile into the created product (bnc#373980) - 2.13.15 Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/VERSION Thu Apr 24 13:23:51 2008 @@ -1 +1 @@ -2.13.14 +2.13.15 Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/package/yast2-cd-creator.changes Thu Apr 24 13:23:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 13:20:19 CEST 2008 - lslezak(a)suse.cz + +- add 'post-packages' from autoyast profile into the created + product (bnc#373980) +- 2.13.15 + +------------------------------------------------------------------- Thu Jan 17 13:01:19 CET 2008 - jsrain(a)suse.cz - merged texts from proofread Modified: branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/cd-creator/src/CDCreator.ycp Thu Apr 24 13:23:51 2008 @@ -1787,6 +1787,15 @@ PackageAI::toinstall = software["packages"]:[]; Config["packages"] = AutoinstSoftware::autoinstPackages(); + + // add "post-packages" + list post_packages = software["post-packages"]:[]; + if (size(post_packages) > 0) + { + y2milestone("Adding \"post-packages\": %1", post_packages); + Config["packages"] = union(Config["packages"]:[], post_packages); + } + y2milestone("Config: %1", Config ); profile_parsed = true; return true; -- 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] r47026 - /tags/stable-2_16_12/online-update/
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:16:34 2008 New Revision: 47026 URL: http://svn.opensuse.org/viewcvs/yast?rev=47026&view=rev Log: Created tag stable-2_16_12 for online-update Added: tags/stable-2_16_12/online-update/ - copied from r47025, trunk/online-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] r47025 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp src/online_update_install.ycp src/online_update_select.ycp
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:16:31 2008 New Revision: 47025 URL: http://svn.opensuse.org/viewcvs/yast?rev=47025&view=rev Log: - warn user if there are selected patches not for package management, do not run solver silently (bnc#367057) - 2.16.12 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp trunk/online-update/src/online_update_install.ycp trunk/online-update/src/online_update_select.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=47025&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Apr 24 13:16:31 2008 @@ -1 +1 @@ -2.16.11 +2.16.12 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Apr 24 13:16:31 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 13:06:59 CEST 2008 - jsuchome(a)suse.cz + +- warn user if there are selected patches not for package management, + do not run solver silently (bnc#367057) +- 2.16.12 + +------------------------------------------------------------------- Tue Apr 15 14:01:30 CEST 2008 - jsuchome(a)suse.cz - merged texts from proofread Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Thu Apr 24 13:16:31 2008 @@ -91,7 +91,7 @@ }); // continue/cancel message if (!is_available && Popup::YesNo (_("No active update repository available. -Exit <b>Online Update</b> now? +Exit Online Update now? "))) { Wizard::CloseDialog(); @@ -202,9 +202,10 @@ Popup::Message (OnlineUpdate::restart_message); } OnlineUpdate::restart_yast = false; - retval = -42;// restart menu.ycp even if there are no other patches selected + // restart menu.ycp even if there are no other patches selected + retval = -42; } - else if (OnlineUpdate::reboot_needed) + if (OnlineUpdate::reboot_needed) { Popup::Message (OnlineUpdate::reboot_message); } Modified: trunk/online-update/src/online_update_install.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update_… ============================================================================== --- trunk/online-update/src/online_update_install.ycp (original) +++ trunk/online-update/src/online_update_install.ycp Thu Apr 24 13:16:31 2008 @@ -56,12 +56,6 @@ if (!Stage::cont ()) Wizard::SetNextButton(`next, Label::FinishButton() ); - if (!Stage::cont ()) - { - Wizard::SetNextButton(`next, Label::FinishButton() ); - Pkg::PkgSolve (true); - } - integer total_progress = size (Pkg::GetPackages (`selected, true)) * 2; if (total_progress == 0) total_progress = 100; Modified: trunk/online-update/src/online_update_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update_… ============================================================================== --- trunk/online-update/src/online_update_select.ycp (original) +++ trunk/online-update/src/online_update_select.ycp Thu Apr 24 13:16:31 2008 @@ -47,28 +47,26 @@ Pkg::PkgEstablish(); + boolean restart_yast = false; + boolean reboot_needed = false; + boolean normal_patches_selected = false; integer selected = 0; string saved_path = Directory::vardir + "/selected_patches.ycp"; - // check if there exists saved selection of patches to be installed + // check if YaST was restarted if (FileUtils::Exists (saved_path)) { - list<string> patches = (list<string>) SCR::Read(.target.ycp,saved_path); - if (patches == nil) - patches = []; - foreach (string pname, patches, { - if (Pkg::ResolvableInstall (pname, `patch)) - selected = selected + 1; - }); + string saved = (string) SCR::Read (.target.ycp, saved_path); + // before restart, patch requiring reboot was installed: + // show the reboot popup now + if (saved != nil && is (saved, string) && saved == "reboot") + reboot_needed = true; SCR::Execute (.target.remove, saved_path); - y2milestone ("Previously selected patches: %1", selected); } + // if not, select the patches affecting pkg management - else - { - selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); - y2milestone ("Preselected patches for pkg management: %1", selected); - } + selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); + y2milestone ("Preselected patches for pkg management: %1", selected); // if no patch is selected, pre-select all security and recommended if (selected < 1) @@ -77,6 +75,8 @@ y2milestone ("All preselected patches: %1", selected); } + Wizard::ClearContents();// do not show the remnant of initial progress + boolean simple_mode = OnlineUpdate::simple_mode && (UI::HasSpecialWidget(`SimplePatchSelector) == true); if (simple_mode) { @@ -103,6 +103,34 @@ current = "simple"; ret = nil; } + if (ret == `accept) + { + restart_yast = false; + normal_patches_selected = false; + foreach (map patch, Pkg::ResolvableProperties ("", `patch, ""), { + if (patch["status"]:`none == `selected) + { + if (patch["affects_pkg_manager"]:false) + restart_yast = true; + else + normal_patches_selected = true; + } + }); + if (restart_yast && normal_patches_selected) + { + // continue/cancel popup + if (!Popup::ContinueCancel (_("There are patches for package management available requiring restart of YaST. +They should be installed first and all other patches after the restart. + +You selected some other patches to be installed now. + +Continue with installing your selection?"))) + { + ret = nil; + UI::OpenDialog (`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode))); + } + } + } } until ( ret == `cancel || ret == `accept ); Wizard::ClearContents(); @@ -110,41 +138,45 @@ y2milestone ("RunPkgSelection finally returned '%1'", ret); if ( ret == `cancel ) return `abort; - boolean restart_yast = false; - list<string> normal_patches = []; boolean more_patches_needed = false; - boolean reboot_needed = false; foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { if (patch["status"]:`none == `selected) { if (patch["reboot_needed"]:false) reboot_needed = true; if (patch["affects_pkg_manager"]:false) - restart_yast = true; + restart_yast = true; else - normal_patches = add (normal_patches, patch["name"]:""); + normal_patches_selected = true; } - else if (patch["is_needed"]:false) // patch not selected: bug #188541 + // patch not selected: bug #188541 - touch saved_path to force the restart + else if (patch["is_needed"]:false) { - y2debug ("patch needed but not selected: %1", patch); + y2milestone ("patch needed but not selected: %1", patch); more_patches_needed = true; } }); - // unselect non-affects_pkg_manager patches and save them to file - // for later usage - if (restart_yast && (size (normal_patches) > 0 || more_patches_needed)) - { - foreach (string pname, normal_patches, { - Pkg::ResolvableNeutral (pname, `patch, true); - }); - SCR::Write (.target.ycp, saved_path, normal_patches); - // show reboot popup only when yast is not going to restart itself automatically + // tell the caller (/sbin/yast2) to call online update again + if (restart_yast && more_patches_needed) + { + // what if kernel (=reboot) and zypp (=restart) are installed together? + // => restart YaST and show reboot message after the second run + string save_message = "restart"; + if (reboot_needed) + save_message = "reboot"; + SCR::Write (.target.ycp, saved_path, save_message); + // show reboot popup only when yast is not going to restart now reboot_needed = false; } + else + { + y2debug ("nothing left for the second run, no restart needed"); + } + // no patch selected - if (!restart_yast && normal_patches == [] && !Pkg::PkgAnyToInstall () && - !Pkg::PkgAnyToDelete ()) + if (!restart_yast && !normal_patches_selected && + !Pkg::PkgAnyToInstall () && !Pkg::PkgAnyToDelete ()) { ret = `cancel; } -- 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] r47024 - /tags/stable-2_16_6/samba-client/
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 13:11:51 2008 New Revision: 47024 URL: http://svn.opensuse.org/viewcvs/yast?rev=47024&view=rev Log: Created tag stable-2_16_6 for samba-client Added: tags/stable-2_16_6/samba-client/ - copied from r47023, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0