April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r47133 - /tags/stable-2_16_40/packager/
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 17:53:14 2008 New Revision: 47133 URL: http://svn.opensuse.org/viewcvs/yast?rev=47133&view=rev Log: Created tag stable-2_16_40 for packager Added: tags/stable-2_16_40/packager/ - copied from r47132, 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

[yast-commit] r47132 - in /trunk/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 17:52:58 2008 New Revision: 47132 URL: http://svn.opensuse.org/viewcvs/yast?rev=47132&view=rev Log: 2.16.40 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47132&r1=47… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Apr 28 17:52:58 2008 @@ -1 +1 @@ -2.16.39 +2.16.40 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 Mon Apr 28 17:52:58 2008 @@ -6,6 +6,7 @@ desktop fails - sort the patterns in the installation proposal by "order" property (bnc#255726) +- 2.16.40 ------------------------------------------------------------------- Mon Apr 28 09:51:02 CEST 2008 - locilka(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

[yast-commit] r47131 - /tags/stable-2_16_41/installation/
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 17:51:46 2008 New Revision: 47131 URL: http://svn.opensuse.org/viewcvs/yast?rev=47131&view=rev Log: Created tag stable-2_16_41 for installation Added: tags/stable-2_16_41/installation/ - copied from r47130, trunk/installation/ -- 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] r47130 - in /trunk/installation: package/yast2-installation.changes src/clients/desktop_finish.ycp src/clients/inst_deploy_image.ycp src/clients/inst_proposal.ycp src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 17:51:10 2008 New Revision: 47130 URL: http://svn.opensuse.org/viewcvs/yast?rev=47130&view=rev Log: - Added possibility to abort installation during image deployment (bnc #382326). - Progress for inst_proposal. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/desktop_finish.ycp trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/clients/inst_proposal.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Apr 28 17:51:10 2008 @@ -5,6 +5,9 @@ (bnc #381821). - Optional and extra URLs moved to control file as well as default update repository (bnc #381360). +- Added possibility to abort installation during image deployment + (bnc #382326). +- Progress for inst_proposal. - 2.16.41 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/desktop_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/desktop… ============================================================================== --- trunk/installation/src/clients/desktop_finish.ycp (original) +++ trunk/installation/src/clients/desktop_finish.ycp Mon Apr 28 17:51:10 2008 @@ -76,36 +76,17 @@ if (selected_desktop == nil || selected_desktop == "") selected_desktop = "gnome"; - string default_dm = dd_map[selected_desktop, "logon"]:""; - string default_wm = dd_map[selected_desktop, "desktop"]:""; - string default_cursor = dd_map[selected_desktop, "cursor"]:""; + string default_dm = ""; + string default_wm = ""; + string default_cursor = ""; - list <string> selected_desktops = DefaultDesktop::SelectedDesktops(); - - list <string> desktop_order = ["gnome", "kde", "kde3", "xfce", "min_x", "textmode"]; + list <string> desktop_order = [DefaultDesktop::Desktop(), "gnome", "kde", "kde3", "xfce", "min_x", "textmode"]; boolean desktop_found = false; - string pattern_desktop = "gnome"; - - // check what packages are in the patterns - // and adjust logon and window manager according to it - foreach (string d, desktop_order, { - if (contains (selected_desktops, d)) { - pattern_desktop = d; - desktop_found = true; - y2milestone ("Setting desktop according to pattern to %1", pattern_desktop); - break; - } - }); - - // if no desktop was found according to pattern, try - // installed packages - // first the logon manager - desktop_order = prepend (desktop_order, pattern_desktop); - desktop_found = false; foreach (string d, desktop_order, { - if (desktop_found) break; + if (desktop_found) + break; foreach (string package, dd_map[d, "packages"]:[], { if (Pkg::IsProvided (package) && (Pkg::PkgInstalled (package) || Pkg::IsSelected (package))) { @@ -124,8 +105,6 @@ y2milestone ("Package %1 for desktop %2 not selected or installed, trying next desktop...", package, d); } }); - - return desktop_found; }); y2milestone ("Default desktop: %1", default_wm); Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de… ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Mon Apr 28 17:51:10 2008 @@ -227,7 +227,11 @@ SourceManager::InstInitSourceMoveDownloadArea(); -ImageInstallation::DeployImages (images, Installation::destdir, nil); +boolean dep_ret = ImageInstallation::DeployImages (images, Installation::destdir, nil); +if (dep_ret == nil) { + y2milestone ("Aborting..."); + return `abort; +} y2milestone ("Target image for package selector prepared"); Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Mon Apr 28 17:51:10 2008 @@ -204,6 +204,36 @@ return description; }; + void SubmoduleHelp (map & prop_map, string & submod) { + if (haskey (prop_map, "help")) + { + boolean use_this_help = false; + // using tabs + if (haskey (mod2tab, submod)) { + // visible in the current tab + if (mod2tab[submod]:999 == current_tab) { + use_this_help = true; + } + // not using tabs + } else { + use_this_help = true; + } + + if (use_this_help) { + y2milestone("Submodule '%1' has it's own help", submod); + string own_help = prop_map["help"]:""; + + if (own_help == nil) { + y2error ("Help text cannot be 'nil'"); + } else if (own_help == "") { + y2milestone ("Skipping empty help"); + } else { + submodule_helps[submod] = prop_map["help"]:""; + } + } + } + } + /** * Call each submodule's MakeProposal() function in turn and display the @@ -224,6 +254,9 @@ link2submod = $[]; + UI::ReplaceWidget (`id ("inst_proposal_progress"), `ProgressBar (`id ("pb_ip"), "", 2 * size (submodules), 0)); + integer submodule_nr = 0; + html = $[]; foreach ( string submod, submodules, ``{ string prop = ""; @@ -258,6 +291,9 @@ y2debug("Submodules list before execution: %1", submodules ); foreach ( string submod, submodules, ``{ + submodule_nr = submodule_nr + 1; + UI::ChangeWidget (`id ("pb_ip"), `Value, submodule_nr); + string prop = ""; if ( ! skip_the_rest ) { @@ -276,36 +312,8 @@ titles[no]:_("ERROR: Missing Title")); } - prop_map = submod_make_proposal( submod, force_reset, language_changed ); - - if (haskey (prop_map, "help")) - { - boolean use_this_help = false; - // using tabs - if (haskey (mod2tab, submod)) { - // visible in the current tab - if (mod2tab[submod]:999 == current_tab) { - use_this_help = true; - } - // not using tabs - } else { - use_this_help = true; - } - - if (use_this_help) { - y2milestone("Submodule '%1' has it's own help", submod); - string own_help = prop_map["help"]:""; - - if (own_help == nil) { - y2error ("Help text cannot be 'nil'"); - } else if (own_help == "") { - y2milestone ("Skipping empty help"); - } else { - submodule_helps[submod] = prop_map["help"]:""; - } - } - } - + prop_map = submod_make_proposal (submod, force_reset, language_changed); + SubmoduleHelp (prop_map, submod); // check if it is needed to switch to another tab // because of an error @@ -368,6 +376,9 @@ { skip_the_rest = true; } + + submodule_nr = submodule_nr + 1; + UI::ChangeWidget (`id ("pb_ip"), `Value, submodule_nr); }); // FATE #301151: Allow YaST proposals to have help texts @@ -398,6 +409,7 @@ // now do the display-only proposals + UI::ReplaceWidget (`id ("inst_proposal_progress"), `Empty()); Wizard::EnableNextButton (); UI::NormalCursor(); }; @@ -543,38 +555,6 @@ get_submod_descriptions_and_build_menu(); }; - - /** - * Load a list of submodules. Try loading it from a file named 'file_name' - * from one of several predefined directories. If there is no such list, - * use 'fallback_list'. - * - * @param file_name YCP file name to load from - * @param fallback_list fallback list of submodule names (strings) - * @return submodules_list list of submodule names (strings) - **/ - - /* OBSOLETE CODE - define list load_submodules_list( string file_name, list fallback_list ) ``{ - - list submodules = (list) SCR::Read(.target.ycp, [ file_name, [] ] ); - - if ( submodules == [] ) - { - submodules = (list) SCR::Read(.target.yast2, [ file_name, [] ] ); - } - - if ( submodules == [] ) - { - submodules = fallback_list; - } - - return submodules; - }; - - */ - - /** * Load a list of submodules matching the current internal states * @@ -735,7 +715,7 @@ ); /* change menu */ - term menu_box = + term menu_box = `VBox ( `HBox ( `HStretch (), `ReplacePoint(`id(`rep_menu), @@ -743,7 +723,9 @@ `MenuButton(`id(`menu_dummy), _("&Change..."), [`item(`id(`dummy), "" ) ] ) ), `HStretch () - ); + ), + `ReplacePoint (`id ("inst_proposal_progress"), `Empty()) + ); term vbox = nil; Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Mon Apr 28 17:51:10 2008 @@ -24,6 +24,7 @@ import "String"; import "Arch"; import "PackageCallbacks"; +import "Popup"; textdomain "installation"; @@ -234,6 +235,9 @@ // Otherwise it will never make 100% integer better_feeling_constant = _checkpoint; + any ret = nil; + boolean aborted = false; + while (SCR::Read (.process.running, pid) == true) { newline = (string) SCR::Read (.process.read_line_stderr, pid); @@ -251,12 +255,23 @@ if (tar_image_progress != nil) tar_image_progress (tointeger (newline) + better_feeling_constant); } else { - // FIXME: UI::PollInput - sleep (200); + ret = UI::PollInput(); + if (ret == `abort || ret == `cancel) { + if (Popup::ConfirmAbort (`unusable)) { + y2warning ("Aborted!"); + aborted = true; + break; + } + } else { + sleep (200); + } } } y2milestone ("Finished"); + if (aborted) + return nil; + // adjust labels etc. if (tar_image_progress != nil) tar_image_progress (100); @@ -513,16 +528,27 @@ integer num = -1; _current_image_from_imageset = -1; + boolean aborted = nil; foreach (string img, images, { num = num + 1; if (progress != nil) progress (num, 0); - DeployImage (img, target); + + if (DeployImage (img, target) == nil) { + aborted = true; + y2milestone ("Aborting..."); + break; + } + if (progress != nil) progress (num, 100); }); + if (aborted) { + return nil; + } + // unregister downloading progress if (download_image_progress != nil) Pkg::CallbackProgressDownload (nil); -- 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] r47129 - /trunk/ncurses-pkg/POTFILES
by kmachalkova＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: kmachalkova Date: Mon Apr 28 17:50:05 2008 New Revision: 47129 URL: http://svn.opensuse.org/viewcvs/yast?rev=47129&view=rev Log: Rename Modified: trunk/ncurses-pkg/POTFILES Modified: trunk/ncurses-pkg/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/POTFILES?rev=47129&r… ============================================================================== --- trunk/ncurses-pkg/POTFILES (original) +++ trunk/ncurses-pkg/POTFILES Mon Apr 28 17:50:05 2008 @@ -6,7 +6,7 @@ ./src/NCPkgMenuView.cc ./src/NCPkgPopupDiskspace.cc ./src/NCPkgFilterSearch.cc -./src/NCPkgFilterContainer.cc +./src/NCPkgFilterPattern.cc ./src/NCPkgFilterMain.cc ./src/NCPkgPopupDeps.cc ./src/NCPkgMenuDeps.cc -- 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] r47128 - /tags/stable-2_16_8/ncurses-pkg/
by kmachalkova＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: kmachalkova Date: Mon Apr 28 17:46:01 2008 New Revision: 47128 URL: http://svn.opensuse.org/viewcvs/yast?rev=47128&view=rev Log: Created tag stable-2_16_8 for ncurses-pkg Added: tags/stable-2_16_8/ncurses-pkg/ - copied from r47127, trunk/ncurses-pkg/ -- 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] r47127 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by kmachalkova＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: kmachalkova Date: Mon Apr 28 17:45:54 2008 New Revision: 47127 URL: http://svn.opensuse.org/viewcvs/yast?rev=47127&view=rev Log: version 2.16.8 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=47127&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Mon Apr 28 17:45:54 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Mon Apr 28 17:45:54 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Apr 28 17:34:54 CEST 2008 - kmachalkova(a)suse.cz + +- Locale (prev. Language) support + displaying locale-related pkgs + re-enabled +- Correctly replace filter description area when switching between + filters (bnc#377857) +- 2.16.8 + +------------------------------------------------------------------- Mon Apr 21 15:22:01 CEST 2008 - kmachalkova(a)suse.cz - Pattern content (required, recommended, suggested pkgs) visible -- 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] r47126 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPkgTable.cc
by kmachalkova＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: kmachalkova Date: Mon Apr 28 17:29:32 2008 New Revision: 47126 URL: http://svn.opensuse.org/viewcvs/yast?rev=47126&view=rev Log: up-to-date API (getting rid of deprecated funcs) Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgTable.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 Mon Apr 28 17:29:32 2008 @@ -1486,7 +1486,7 @@ ++it ) { if ( (*it)->candidateObj() ) - totalSize += (*it)->candidateObj()->size(); + totalSize += (*it)->candidateObj()->installsize(); } // show the download size Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Mon Apr 28 17:29:32 2008 @@ -441,7 +441,7 @@ // static bool slbHasInstalledObj (const ZyppSel & slb) { - return slb->hasInstalledObj (); + return ! slb->installedEmpty (); } /////////////////////////////////////////////////////////////////// @@ -564,7 +564,7 @@ { case T_PatchPkgs: { // if the package is installed, get the installed version - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { instVersion = slbPtr->installedObj()->edition().asString(); } @@ -587,7 +587,7 @@ status = slbPtr->status(); // the package status yuiMilestone() << "Status of " << slbPtr->name() << ": " << status << endl; - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size break; @@ -606,7 +606,7 @@ // set package status either to S_NoInst or S_KeepInstalled status = S_NoInst; - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { if ( pkgPtr->edition() == slbPtr->installedObj()->edition() && pkgPtr->arch() == slbPtr->installedObj()->arch() ) @@ -615,7 +615,7 @@ } } - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size pkgLine.push_back( pkgPtr->arch().asString()); // architecture @@ -626,7 +626,7 @@ // if the package is installed, get the installed version pkgLine.push_back( pkgPtr->summary() ); // short description - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { instVersion = slbPtr->installedObj()->edition().version(); @@ -649,7 +649,7 @@ status = slbPtr->status(); // the package status - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size // Selectable does not have source_install @@ -1055,7 +1055,7 @@ // clear the package table itemsCleared (); - yuiDebug() << "Number of available packages: " << slb->availableObjs() << endl; + yuiDebug() << "Number of available packages: " << slb->availableSize() << endl; // show all availables zypp::ui::Selectable::available_iterator @@ -1074,7 +1074,7 @@ } createListEntry( tryCastToZyppPkg (*it), slb ); } - if ( slb->hasInstalledObj() && addInstalled ) + if ( (! slb->installedEmpty()) && addInstalled ) { createListEntry( tryCastToZyppPkg (slb->installedObj()), slb ); } -- 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] r47125 - in /trunk/packager: package/yast2-packager.changes src/clients/sw_single.ycp src/modules/Packages.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: lslezak Date: Mon Apr 28 17:26:12 2008 New Revision: 47125 URL: http://svn.opensuse.org/viewcvs/yast?rev=47125&view=rev Log: - sw_single - removed extra UI::CloseDialog() call (bnc#382580), display an error message when installation of a package from desktop fails - sort the patterns in the installation proposal by "order" property (bnc#255726) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp trunk/packager/src/modules/Packages.ycp trunk/packager/yast2-packager.spec.in 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 Mon Apr 28 17:26:12 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Apr 28 17:03:41 CEST 2008 - lslezak(a)suse.cz + +- sw_single - removed extra UI::CloseDialog() call (bnc#382580), + display an error message when installation of a package from + desktop fails +- sort the patterns in the installation proposal by "order" + property (bnc#255726) + +------------------------------------------------------------------- Mon Apr 28 09:51:02 CEST 2008 - locilka(a)suse.cz - Fixed KDE 3.5 description (bnc #379157). 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 Mon Apr 28 17:26:12 2008 @@ -157,7 +157,19 @@ if (SCR::Read (.target.size, package) > 0) { y2milestone ("SW_SINGLE: installing %1", package); - Pkg::TargetInstall (package); + boolean installed = Pkg::TargetInstall (package); + + if (!installed) + { + // Error message: + // %1 = package name (may include complete RPM file name) + // %2 = error message + Report::Error(sformat(_("Package %1 could not be installed. + +Details: +%2 +"), package, Pkg::LastError())); + } } else { @@ -334,7 +346,6 @@ || (result == `failed)) { UI::CloseDialog(); - UI::CloseDialog(); return `next; } Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Apr 28 17:26:12 2008 @@ -131,6 +131,24 @@ selected = filter (map<string,any> r, selected, { return r["user_visible"]:nil == true; }); + + // order patterns according to "order" flag + selected = sort(map<string,any> x, map<string,any> y, selected, + { + integer xo = tointeger(x["order"]:""); + integer yo = tointeger(y["order"]:""); + + if (xo == nil || yo == nil) + { + // order is not an integer, compare as strings + return x["order"]:"" < y["order"]:""; + } + else + { + return xo < yo; + } + } + ); } selected = filter (map<string,any> r, selected, { Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Mon Apr 28 17:26:12 2008 @@ -7,8 +7,8 @@ # empty package callbacks BuildRequires: yast2 >= 2.16.52 -# Pkg::PkgMediaPackageSizes() -BuildRequires: yast2-pkg-bindings >= 2.16.29 +# "order" flag for pattern resolvables +BuildRequires: yast2-pkg-bindings >= 2.16.31 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings @@ -17,8 +17,8 @@ Requires: yast2-country-data >= 2.16.3 Requires: yast2-installation >= 2.15.12 -# Pkg::PkgMediaPackageSizes() -Requires: yast2-pkg-bindings >= 2.16.29 +# "order" flag for pattern resolvables +Requires: yast2-pkg-bindings >= 2.16.31 # empty package callbacks Requires: yast2 >= 2.16.52 -- 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] r47124 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by coolo＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: coolo Date: Mon Apr 28 17:05:13 2008 New Revision: 47124 URL: http://svn.opensuse.org/viewcvs/yast?rev=47124&view=rev Log: 150 revisions Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Mon Apr 28 17:05:13 2008 @@ -1 +1 @@ -47035 +47124 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Mon Apr 28 17:05:13 2008 @@ -1 +1 @@ -9825 +9871 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0