November 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62723 - in /branches/SuSE-SLE-10-SP4-Branch/bootloader: package/yast2-bootloader.changes src/routines/misc.ycp
by jreidinger＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: jreidinger Date: Tue Nov 2 19:05:58 2010 New Revision: 62723 URL: http://svn.opensuse.org/viewcvs/yast?rev=62723&view=rev Log: Fix detection of HyperV as during install there is not lscpu utility (bnc#650780) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes Tue Nov 2 19:05:58 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 2 18:04:50 UTC 2010 - jreidinger(a)novell.com + +- Fix detection of HyperV as during install there is not lscpu + utility (bnc#650780) +- 2.13.167 + +------------------------------------------------------------------- Fri Oct 22 10:12:58 UTC 2010 - jreidinger(a)novell.com - add detection of HyperV and boot parameter for it (FATE#309005) Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Tue Nov 2 19:05:58 2010 @@ -2009,10 +2009,9 @@ boolean xen = (boolean)SCR::Read(.probe.is_xen); // check if it is HVM guest only if ((!Arch::is_xen()) && (xen == true)) - ret = true; - string hyperV = ((map<string, any>)SCR::Execute(.target.bash_output, - "lscpu | grep -c '^Hypervisor vendor:[[:blank:]]*Microsoft$'"))["stdout"]:"0"; - if (hyperV == "1") //TODO convert to int + ret = true; + integer hyperV = (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus"); + if (hyperV == 0) //module can be loaded, so we are in HyperV (bnc#650780) ret = true; return ret; } -- 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] r62722 - /tags/stable-2_20_2/yast2/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 16:10:57 2010 New Revision: 62722 URL: http://svn.opensuse.org/viewcvs/yast?rev=62722&view=rev Log: Created tag stable-2_20_2 for yast2 Added: tags/stable-2_20_2/yast2/ (props changed) - copied from r62721, trunk/yast2/ -- 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] r62721 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes yast2.spec.in
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 16:09:53 2010 New Revision: 62721 URL: http://svn.opensuse.org/viewcvs/yast?rev=62721&view=rev Log: - updated to match the changed StartPackage callback signature - 2.20.2 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62721&r1=62720… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Nov 2 16:09:53 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Tue Nov 2 16:09:53 2010 @@ -475,23 +475,13 @@ /** * At start of package install. */ - global void StartPackage (string name, string summary, integer + global void StartPackage (string name, string location, string summary, integer installsize, boolean is_delete) { if (!enable_asterix_package) return; - list<string> parsed_path = splitstring(name, "/"); - - if (size(parsed_path) > 0) - { - _package_name = parsed_path[size(parsed_path) - 1]:""; - } - else - { - _package_name = name; - } - + _package_name = name; _package_size = installsize; _deleting_package = is_delete; string sz = String::FormatSizeWithPrecision (installsize, 2, false); @@ -2973,7 +2963,7 @@ string DummyDoneProvide (integer error, string reason, string name) {y2debug("Empty DoneProvide callback, returning 'I'");return "I";} -void DummyStartPackage (string name, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} +void DummyStartPackage (string name, string location, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} string DummyDonePackage (integer error, string reason) {y2debug("Empty DonePackage callback, returning 'I'");return "I";} Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Nov 2 16:09:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 2 15:09:00 UTC 2010 - lslezak(a)suse.cz + +- updated to match the changed StartPackage callback signature +- 2.20.2 + +------------------------------------------------------------------- Mon Oct 18 15:04:37 UTC 2010 - lslezak(a)suse.cz - don't display extra error popup when a download fails, the error Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=62721&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Tue Nov 2 16:09:53 2010 @@ -7,7 +7,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings # Needed already in build time -BuildRequires: yast2-pkg-bindings >= 2.17.32 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-pkg-bindings >= 2.20.3 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -18,8 +18,8 @@ # new UI::OpenContextMenu Requires: yast2-ycp-ui-bindings >= 2.18.4 -# Pkg::Get(Set)SolverFlags() -Requires: yast2-pkg-bindings >= 2.17.32 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 Requires: yast2_ui yast2-branding # For Cron Agent, Module Requires: perl-Config-Crontab -- 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] r62720 - /tags/stable-2_20_1/online-update/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:54:33 2010 New Revision: 62720 URL: http://svn.opensuse.org/viewcvs/yast?rev=62720&view=rev Log: Created tag stable-2_20_1 for online-update Added: tags/stable-2_20_1/online-update/ - copied from r62719, 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] r62719 - /tags/stable-2_20_8/packager/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:55 2010 New Revision: 62719 URL: http://svn.opensuse.org/viewcvs/yast?rev=62719&view=rev Log: Created tag stable-2_20_8 for packager Added: tags/stable-2_20_8/packager/ - copied from r62718, 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] r62718 - /tags/stable-2_20_8/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:49 2010 New Revision: 62718 URL: http://svn.opensuse.org/viewcvs/yast?rev=62718&view=rev Log: Created tag stable-2_20_8 Added: tags/stable-2_20_8/ -- 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] r62717 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageSlideShow.ycp src/modules/SlideShowCallbacks.ycp yast2-packager.spec.in
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:49:08 2010 New Revision: 62717 URL: http://svn.opensuse.org/viewcvs/yast?rev=62717&view=rev Log: - correctly collect package installation log in DownloadInAdvance libzypp mode - 2.20.8 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp trunk/packager/src/modules/SlideShowCallbacks.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62717&r1=62… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Nov 2 15:49:08 2010 @@ -1 +1 @@ -2.20.7 +2.20.8 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 Tue Nov 2 15:49:08 2010 @@ -3,6 +3,7 @@ - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) +- 2.20.8 ------------------------------------------------------------------- Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 2 15:49:08 2010 @@ -71,7 +71,6 @@ integer current_provide_size = 0; integer current_install_size = 0; - string current_pkg_name = ""; boolean updating = false; void ResetPackageSummary() @@ -86,7 +85,6 @@ // temporary values current_provide_size = 0; current_install_size = 0; - current_pkg_name = ""; updating = false; } @@ -1098,7 +1096,7 @@ if (Mode::normal()) { - updated_packages_list = add(updated_packages_list, current_pkg_name); + updated_packages_list = add(updated_packages_list, pkg_name); } } else @@ -1107,7 +1105,7 @@ if (Mode::normal()) { - installed_packages_list = add(installed_packages_list, current_pkg_name); + installed_packages_list = add(installed_packages_list, pkg_name); } } @@ -1120,7 +1118,7 @@ if (Mode::normal()) { - removed_packages_list = add(removed_packages_list, current_pkg_name); + removed_packages_list = add(removed_packages_list, pkg_name); } } } @@ -1136,6 +1134,7 @@ * @param deleting Flag: deleting (true) or installing (false) package? **/ global void SlideDisplayStart( string pkg_name, + string pkg_location, string pkg_summary, integer pkg_size, boolean deleting ) @@ -1143,10 +1142,8 @@ if ( ! SanityCheck( false ) ) return; // remove path - pkg_name = StripPath(pkg_name); - - // remove release and .rpm suffix - // pkg_name = StripReleaseNo( pkg_name ); // bug #154872 + string pkg_filename = StripPath(pkg_location); + y2internal("pkg_name: %1", pkg_name); if ( deleting ) { @@ -1175,15 +1172,14 @@ // Heading for the progress bar for the current package // while it is deleted. "%1" is the package name. msg = sformat( _("Deleting %1"), pkg_name ); - current_pkg_name = pkg_name; } else { - updating = Pkg::PkgInstalled(current_pkg_name); + updating = Pkg::PkgInstalled(pkg_name); // package installation - summary text // %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) - msg = sformat( _("Installing %1 (installed size %2)"), pkg_name, String::FormatSize( pkg_size ) ); + msg = sformat( _("Installing %1 (installed size %2)"), pkg_filename, String::FormatSize( pkg_size ) ); current_install_size = pkg_size; } @@ -1270,7 +1266,6 @@ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { current_provide_size = remote ? sz : 0; - current_pkg_name = pkg_name; if (remote) { Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Tue Nov 2 15:49:08 2010 @@ -284,9 +284,9 @@ * Note: The packager doesn't call this directly - the corresponding wrapper callbacks do * and pass the "deleting" flag as appropriate. **/ - global void DisplayStartInstall(string pkg_name, string pkg_description, integer pkg_size, boolean deleting ) + global void DisplayStartInstall(string pkg_name, string pkg_location, string pkg_description, integer pkg_size, boolean deleting ) { - PackageSlideShow::SlideDisplayStart( pkg_name, pkg_description, pkg_size, deleting ); + PackageSlideShow::SlideDisplayStart( pkg_name, pkg_location, pkg_description, pkg_size, deleting ); HandleInput(); // warn user about exhausted diskspace during installation (not if deleting packages) @@ -368,13 +368,13 @@ /** * at start of package install */ - global void StartPackage( string name, string summary, integer install_size, boolean is_delete ) + global void StartPackage( string name, string location, string summary, integer install_size, boolean is_delete ) { PackageCallbacks::_package_name = name; PackageCallbacks::_package_size = install_size; PackageCallbacks::_deleting_package = is_delete; - DisplayStartInstall( name, + DisplayStartInstall( name, location, summary, install_size, is_delete); 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 Tue Nov 2 15:49:08 2010 @@ -12,14 +12,14 @@ # Installation summary in PackagesUI:: BuildRequires: yast2 >= 2.18.1 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +BuildRequires: yast2-pkg-bindings >= 2.20.3 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 # Installation summary in PackagesUI:: Requires: yast2 >= 2.18.1 -- 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] r62716 - /tags/stable-2_20_3/pkg-bindings/
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:42:01 2010 New Revision: 62716 URL: http://svn.opensuse.org/viewcvs/yast?rev=62716&view=rev Log: Created tag stable-2_20_3 for pkg-bindings Added: tags/stable-2_20_3/pkg-bindings/ - copied from r62715, trunk/pkg-bindings/ -- 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] r62715 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 15:41:55 2010 New Revision: 62715 URL: http://svn.opensuse.org/viewcvs/yast?rev=62715&view=rev Log: - updated StartPackage callback - added the package name to the arguments (file location is not enough, it's too dificult to get just the name from it in YCP) - 2.20.3 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/PkgFunctions.h Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=62715&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Nov 2 15:41:55 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Nov 2 15:41:55 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 2 14:30:38 UTC 2010 - lslezak(a)suse.cz + +- updated StartPackage callback - added the package name to the + arguments (file location is not enough, it's too dificult to get + just the name from it in YCP) +- 2.20.3 + +------------------------------------------------------------------- Mon Oct 25 07:29:56 UTC 2010 - lslezak(a)suse.cz - ignore just the failed repository during autorefresh, load the Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue Nov 2 15:41:55 2010 @@ -244,6 +244,7 @@ CB callback( ycpcb( YCPCallbacks::CB_StartPackage ) ); if (callback._set) { + callback.addStr(res->name()); callback.addStr(res->location().filename()); callback.addStr(res->summary()); callback.addInt(res->installSize()); @@ -352,6 +353,7 @@ if (callback._set) { callback.addStr(resolvable->name()); callback.addStr(std::string()); + callback.addStr(std::string()); callback.addInt(-1); callback.addBool(true); // is_delete = true callback.evaluate(); Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Tue Nov 2 15:41:55 2010 @@ -267,7 +267,7 @@ // FIXME: create ErrorProvide /* TYPEINFO: void(string(integer,string,string)) */ YCPValue CallbackDoneProvide (const YCPValue& /*nil*/ args); - /* TYPEINFO: void(void(string,string,integer,boolean)) */ + /* TYPEINFO: void(void(string,string,string,integer,boolean)) */ YCPValue CallbackStartPackage (const YCPValue& /*nil*/ args); /* TYPEINFO: void(boolean(integer)) */ YCPValue CallbackProgressPackage (const YCPValue& /*nil*/ args); -- 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] r62714 - in /trunk/packager: agents/Makefile.am agents/etc_zypp_conf.scr package/yast2-packager.changes src/modules/PackageSlideShow.ycp
by lslezak＠svn2.opensuse.org 02 Nov '10

02 Nov '10

Author: lslezak Date: Tue Nov 2 14:03:08 2010 New Revision: 62714 URL: http://svn.opensuse.org/viewcvs/yast?rev=62714&view=rev Log: - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) Added: trunk/packager/agents/etc_zypp_conf.scr Modified: trunk/packager/agents/Makefile.am trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp Modified: trunk/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/agents/Makefile.am?rev=… ============================================================================== --- trunk/packager/agents/Makefile.am (original) +++ trunk/packager/agents/Makefile.am Tue Nov 2 14:03:08 2010 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/packager/agents/etc_zypp_conf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/agents/etc_zypp_conf.sc… ============================================================================== --- trunk/packager/agents/etc_zypp_conf.scr (added) +++ trunk/packager/agents/etc_zypp_conf.scr Tue Nov 2 14:03:08 2010 @@ -0,0 +1,65 @@ +/** + * File: + * etc_zypp_conf.scr + * Summary: + * SCR Agent for reading/writing /etc/zypp/zypp.conf file + * using the ini-agent + * Access: + * read/write + * Authors: + * Ladislav Slezak <lslezak(a)suse.cz> + * Example: + * + * Read list of available files + * SCR::Dir(.etc.zypp_conf) + * + * Read list of sections in a file + * SCR::Dir(.etc.policykit.section."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege") + * (["Privilege"]) + * + * Read list of options in a section + * SCR::Dir(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege") + * (["RequiredPrivileges", "SufficientPrivileges", "Allow", "Deny", "CanObtain", "CanGrant", "ObtainRequireRoot"]) + * + * Read an option + * SCR::Read(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges") + * ("desktop-console") + * + * + * Write an option + * SCR::Write(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges", "") + * (true) + * + * + * Flush the changes + * SCR::Write(.etc.zypp_conf, nil) + * + * + * Fore more information see the INI-agent documentation + * + * $Id$ + */ + +.etc.zypp_conf + +`ag_ini( + `IniAgent( "/etc/zypp/zypp.conf" , $[ + "options" : [ "no_nested_sections", "line_can_continue", "comments_last" ], + "comments": [ + "^[ \t]*$", // empty line + "^[ \t]*#.*$", // comment char + ], + "sections" : [ + $[ + "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], + ] + ], + "params" : [ + $[ + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"], + ] + ] + ] + ) +) + 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 Tue Nov 2 14:03:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 2 13:00:15 UTC 2010 - lslezak(a)suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) + +------------------------------------------------------------------- Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz - sw_single: clear the startup progress dialog so it's not Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 2 14:03:08 2010 @@ -16,6 +16,7 @@ import "SlideShow"; import "String"; import "Mode"; + import "URL"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -28,6 +29,9 @@ global string media_type = _("Medium %1"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -47,6 +51,8 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size + boolean download_in_advance_mode = false; + // package summary // package counters @@ -405,6 +411,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(list<list<integer> >src_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(list<list<integer> >src_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -454,6 +504,11 @@ remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); + download_in_advance_mode= (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") == "DownloadInAdvance"; init_pkg_data_complete = true; // reset the history log @@ -783,6 +838,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -796,7 +872,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -943,6 +1020,21 @@ if (error == 0) { total_downloaded = total_downloaded + current_provide_size; + + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (download_in_advance_mode) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0