July 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39768 - in /trunk/yast2: library/system/src/Kernel.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jsrain Date: Mon Jul 30 13:13:36 2007 New Revision: 39768 URL: http://svn.opensuse.org/viewcvs/yast?rev=39768&view=rev Log: install bigsmp kernel regardless the memory size (Fate #159006) Modified: trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.… ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Mon Jul 30 13:13:36 2007 @@ -375,16 +375,17 @@ string cpuinfo_flags = (string) SCR::Read(.proc.cpuinfo.value."0"."flags"); // check only first processor list cpuflags = (size(cpuinfo_flags) > 0) ? splitstring(cpuinfo_flags, " ") : []; - +/* // check for "roughly" >= 4GB memory (see bug #40729) list memories = (list) SCR::Read(.probe.memory); integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; integer fourGB = 0x0C0000000; y2milestone ("Physical memory %1", memsize); - +*/ // for memory > 4GB and PAE support we install kernel-bigsmp, // regardles of SMP or not. - if (memsize >= fourGB && contains (cpuflags, "pae")) +// install bigsmp kernel regardless the memory size - fate #159006 + if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae")) { y2milestone ("Kernel switch: mem >= 4GB && PAE"); kernel_packages = ["kernel-bigsmp"]; 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 Mon Jul 30 13:13:36 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 30 13:08:04 CEST 2007 - jsrain(a)suse.cz + +- install bigsmp kernel regardless the memory size (Fate #159006) + +------------------------------------------------------------------- Thu Jul 26 10:07:51 CEST 2007 - jsrain(a)suse.cz - added Provides: yast2-devel to yast2-devel-doc -- 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] r39767 - in /trunk/installation/control: control.openSUSE.xml control.xml
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 13:05:22 2007 New Revision: 39767 URL: http://svn.opensuse.org/viewcvs/yast?rev=39767&view=rev Log: Correct name :) ehm Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Jul 30 13:05:22 2007 @@ -367,7 +367,7 @@ <name>update_partition</name> </module> <module> - <name>upgrade_url</name> + <name>upgrade_urls</name> </module> <module> <label>Additional Product Sources</label> Modified: trunk/installation/control/control.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml… ============================================================================== --- trunk/installation/control/control.xml (original) +++ trunk/installation/control/control.xml Mon Jul 30 13:05:22 2007 @@ -354,7 +354,7 @@ <enable_next>yes</enable_next> </module> <module> - <name>upgrade_url</name> + <name>upgrade_urls</name> <enable_back>yes</enable_back> <enable_next>yes</enable_next> </module> -- 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] r39766 - in /trunk/fingerprint-reader/src: UsersPluginFingerprintReader.pm dialogs.ycp users_plugin_fingerprint_reader.ycp
by jsuchome＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jsuchome Date: Mon Jul 30 12:59:50 2007 New Revision: 39766 URL: http://svn.opensuse.org/viewcvs/yast?rev=39766&view=rev Log: syntax errors, help text fixes from taroth Modified: trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm trunk/fingerprint-reader/src/dialogs.ycp trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/UsersPlug… ============================================================================== --- trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm (original) +++ trunk/fingerprint-reader/src/UsersPluginFingerprintReader.pm Mon Jul 30 12:59:50 2007 @@ -71,7 +71,9 @@ sub is_fingerprint_reader_available { if (not defined $fingerprint_reader_available) { - my @devices = @{SCR->Read (".probe.fingerprint")}; + my $probe = SCR->Read (".probe.fingerprint"); + my @devices = (); + @devices = @{$probe} if (ref $probe eq "ARRAY"); $fingerprint_reader_available = (@devices > 0); } return $fingerprint_reader_available; Modified: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.y… ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Mon Jul 30 12:59:50 2007 @@ -35,6 +35,7 @@ import "FileUtils"; import "FingerprintReader"; import "Label"; +import "Package"; import "Popup"; import "Stage"; import "Wizard"; @@ -79,10 +80,10 @@ // help text string help_text = _(" <big>Fingerprint Authentication</big> -The Fingerprint Reader configuration updates your PAM settings to enable authentication with fingerprints.") + +The Fingerprint Reader Configuration updates your PAM settings to enable authentication with fingerprints.") + // help text, cont. - _("To import fingerprint files from different system or previous installation, choose the directory with their location."); + _("To import fingerprint files from different installations, choose the directory where the files are located."); term con = `HBox (`HSpacing (3), `VBox ( // frame label @@ -126,7 +127,7 @@ ret = UI::UserInput(); string import_dir = (string)UI::QueryWidget (`id (`import_dir), `Value); - if (ret == `pamyes || result == `pamno) + if (ret == `pamyes || ret == `pamno) { use_pam = (ret == `pamyes); UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Mon Jul 30 12:59:50 2007 @@ -52,7 +52,8 @@ string caption = UsersPluginFingerprintReader::Name (config, $[]); // help text for fingerprint reader plugin - string help_text = _("Enroll your finger on the fingerprint reader. Three succefull attempt are needed to save the new fingerprint."); + string help_text = _("Swipe your finger on the fingerprint reader. Three successful attempts +are needed to save the new fingerprint."); string username = data["uid"]:""; if (username == "") { -- 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] r39765 - /trunk/installation/control/control.openSUSE.xml
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 12:59:12 2007 New Revision: 39765 URL: http://svn.opensuse.org/viewcvs/yast?rev=39765&view=rev Log: Adding the feature the the correct control file Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Jul 30 12:59:12 2007 @@ -367,6 +367,9 @@ <name>update_partition</name> </module> <module> + <name>upgrade_url</name> + </module> + <module> <label>Additional Product Sources</label> <name>productsources</name> <enable_back>yes</enable_back> -- 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] r39764 - /trunk/users/src/users_plugin_quota.ycp
by jsuchome＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jsuchome Date: Mon Jul 30 12:51:48 2007 New Revision: 39764 URL: http://svn.opensuse.org/viewcvs/yast?rev=39764&view=rev Log: help text fixes from Tanja Roth Modified: trunk/users/src/users_plugin_quota.ycp Modified: trunk/users/src/users_plugin_quota.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_quota.ycp… ============================================================================== --- trunk/users/src/users_plugin_quota.ycp (original) +++ trunk/users/src/users_plugin_quota.ycp Mon Jul 30 12:51:48 2007 @@ -118,27 +118,29 @@ string help_text = _("Here, configure quota settings of the user on selected file systems.") + // helptext for quota, cont. - _("Soft limit shows the maximum number of 1kB blocks (or number of i-nodes) user may have on partition before warning is issued and grace persiod countdown begins.") + + _("Define a Size Limit by specifying the number of 1 kB blocks the +user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.") + // helptext for quota, cont. - _("Set hard limits to adapt maximum number of 1kB blocks (or number of i-nodes) user may have on partition.") + + _("You can specify both Soft and Hard Limits for size and number of inodes. The soft limits define a warning level at which users are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.") + // helptext for quota, cont. - _("If user exceedes the softlimit quota, widgets with the time setting are enabled. Adjust the grace time for user by setting the time in those widgets."); + _("As soon as the user has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the user is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately."); if (what == "group") { - // helptext for group quota + // helptext for quota help_text = _("Here, configure quota settings of the group on selected file systems.") + - // helptext for group quota, cont. - _("Soft limit shows the maximum number of 1kB blocks (or number of i-nodes) group of users may have on partition before warning is issued and grace persiod countdown begins.") + + // helptext for quota, cont. + _("Define a Size Limit by specifying the number of 1 kB blocks the +group may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may have on the file system.") + - // helptext for group quota, cont. - _("Set hard limits to adapt maximum number of 1kB blocks (or number of i-nodes) group may have on partition.") + + // helptext for quota, cont. + _("You can specify both Soft and Hard Limits for size and number of inodes. The soft limits define a warning level at which groups are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.") + - // helptext for group quota, cont. - _("If group exceedes the softlimit quota, widgets with the time setting are enabled. Adjust the grace time for group by setting the time in those widgets."); + // helptext for quota, cont. + _("As soon as the group has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the group is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately."); } boolean modified = data["plugin_modified"]:0 == 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] r39763 - in /trunk/packager: package/ src/clients/ src/include/ src/modules/
by jsrain＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jsrain Date: Mon Jul 30 12:47:35 2007 New Revision: 39763 URL: http://svn.opensuse.org/viewcvs/yast?rev=39763&view=rev Log: allow to display release notes while installing packages (Fate #302342) Added: trunk/packager/src/include/load_release_notes.ycp Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_source.ycp trunk/packager/src/include/Makefile.am trunk/packager/src/modules/Makefile.am trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/SlideShow.ycp 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 Jul 30 12:47:35 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 30 11:41:35 CEST 2007 - jsrain(a)suse.cz + +- allow to display release notes while installing packages + (Fate #302342) + +------------------------------------------------------------------- Fri Jul 27 14:15:40 CEST 2007 - locilka(a)suse.cz - Added new SCR agents ag_anyxml and ag_zypp_repos (FATE #301785). Modified: trunk/packager/src/clients/inst_source.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_source… ============================================================================== --- trunk/packager/src/clients/inst_source.ycp (original) +++ trunk/packager/src/clients/inst_source.ycp Mon Jul 30 12:47:35 2007 @@ -483,9 +483,12 @@ `Left (`Label ("Category:")) )), `VSpacing (0.4), + // label `Left (`Label (_("Properties"))), + // check box `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))), - `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Autorefresh"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))), `VSpacing (0.4), (have_rug) ? `Left (`CheckBox (`id (`zmdsync), Modified: trunk/packager/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/Makefile.am… ============================================================================== --- trunk/packager/src/include/Makefile.am (original) +++ trunk/packager/src/include/Makefile.am Mon Jul 30 12:47:35 2007 @@ -7,7 +7,8 @@ ynclude_DATA = \ inst_source_dialogs.ycp \ - storage_include.ycp + storage_include.ycp \ + load_release_notes.ycp EXTRA_DIST = $(ynclude_DATA) Added: trunk/packager/src/include/load_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/load_releas… ============================================================================== --- trunk/packager/src/include/load_release_notes.ycp (added) +++ trunk/packager/src/include/load_release_notes.ycp Mon Jul 30 12:47:35 2007 @@ -0,0 +1,64 @@ +/** + * File: installation/include/load_release_notes.ycp + * Module: Installation + * Summary: Load release notes from media + * Authors: Arvin Schnell <arvin(a)suse.de> + * Jiri Srain <jsrain(a)suse.cz> + * + * Load release notes from media + * + * $Id: release_notes_popup.ycp 34411 2006-11-15 13:45:11Z locilka $ + */ + +{ + textdomain "installation"; + + import "Language"; + import "Report"; + import "Stage"; + + /* release notes */ + string media_text = ""; + + +// FIXME get rid of similar funciton in instlalation/clients/release_notes_popup.ycp + + /* function to load release notes */ + define boolean load_release_notes (integer source_id) + { + string path_to_relnotes = "/docu"; + string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; + y2debug ("Path template: %1", path_templ); + string tmp = sformat (path_templ, Language::language); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); + if (tmp == nil) + { + tmp = sformat (path_templ, substring (Language::language, 0, 2)); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); + } + if (tmp == nil) + { + tmp = sformat (path_templ, "en"); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideFile (source_id, 1, tmp); + } + if (tmp == nil) + return false; + + media_text = (string)SCR::Read (.target.string, [tmp, ""]); + if (media_text != "" && media_text != nil) + return true; + return false; + }; + + string media_prefix = +// beginning of the rich text with the release notes +_("These are the release notes made for the first initial release. They are +part of the installation media. During installation, if a connection +to the Internet is available, you can download updated release notes +from the SUSE Linux Web server."); + +} + Modified: trunk/packager/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Makefile.am… ============================================================================== --- trunk/packager/src/modules/Makefile.am (original) +++ trunk/packager/src/modules/Makefile.am Mon Jul 30 12:47:35 2007 @@ -1,5 +1,13 @@ # Makefile.am for packager/src/modules +YCPCFLAGS = -I . -M . + module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) EXTRA_DIST = $(module_DATA) + +packager: + ln -sf ../include packager + +ycpchook = packager + include $(top_srcdir)/Makefile.am.common 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 Jul 30 12:47:35 2007 @@ -39,6 +39,8 @@ import "FileUtils"; import "PackageCallbacks"; +include "packager/load_release_notes.ycp"; + /** * Force full proposal routine next run */ @@ -823,6 +825,11 @@ y2milestone ("Setting up the slide directory local copy: %1", our_slidedir); SlideShow::SetSlideDir (our_slidedir); + if (load_release_notes (source)) + { + SlideShow::relnotes = media_prefix + media_text; + } + } integer IntegrateServicePack (boolean show_popup, string base_url) { Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.y… ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Mon Jul 30 12:47:35 2007 @@ -70,6 +70,8 @@ boolean user_abort = false; + global string relnotes = nil; + /** * Constructor **/ @@ -147,6 +149,15 @@ return widgets_created && UI::WidgetExists(`slidesPage ); } + /** + * Check if currently the "Release Notes" page is shown + * @return true if showing details, false otherwise + **/ + boolean ShowingRelNotes() + { + return widgets_created && UI::WidgetExists(`relNotesPage); + } + /** * Sum up all list items @@ -1483,6 +1494,14 @@ return widgets; } + term RelNotesPageWidgets() { + term widgets = AddProgressWidgets (`relNotesPage, + `RichText (relnotes) + ); + y2debug( "widget term: \n%1", widgets ); + return widgets; + } + /** * Switch from the 'details' view to the 'slide show' view. @@ -1522,6 +1541,22 @@ UI::ChangeWidget(`instLog, `Value, inst_log ); } + /** + * Switch to the 'release notes' view. + **/ + global void SwitchToReleaseNotesView() + { + if ( ShowingRelNotes() ) + return; + + if ( UI::WidgetExists(`tabContents ) ) + { + UI::ChangeWidget(`dumbTab, `CurrentItem, `showRelNotes ); + UI::ReplaceWidget(`tabContents, RelNotesPageWidgets() ); + UpdateTotalProgress(false); + } + } + string HelpText() { @@ -1541,14 +1576,18 @@ if ( UI::HasSpecialWidget(`DumbTab) && HaveSlideSupport() && HaveSlides() ) { - contents = - `DumbTab(`id(`dumbTab ), - [ + list tabs = [ + // tab + `item(`id(`showSlide ), _("Slide Sho&w") ), + // tab + `item(`id(`showDetails ), _("&Details") ) + ]; + if (relnotes != nil && relnotes != "") // tab - `item(`id(`showSlide ), _("Slide Sho&w") ), - // tab - `item(`id(`showDetails ), _("&Details") ) - ], + tabs = add (tabs, `item (`id (`showRelNotes), _("Release &Notes"))); + + contents = + `DumbTab(`id(`dumbTab ), tabs, `VBox( `VSpacing( 0.4 ), `VWeight( 1, // lower layout priority @@ -1788,6 +1827,11 @@ UI::ChangeWidget(`dumbTab, `CurrentItem, `showDetails ); } } + else if ( button == `showRelNotes && ! ShowingRelNotes() ) + { + user_switched_to_details = false; + SwitchToReleaseNotesView(); + } else if ( button == `debugHotkey ) { debug = ! debug; -- 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] r39762 - in /trunk/installation: package/yast2-installation.changes yast2-installation.spec.in
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 12:47:05 2007 New Revision: 39762 URL: http://svn.opensuse.org/viewcvs/yast?rev=39762&view=rev Log: - Adjusted RPM dependencies (.anyxml SCR agent). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in 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 Jul 30 12:47:05 2007 @@ -2,8 +2,9 @@ Mon Jul 30 12:38:31 CEST 2007 - locilka(a)suse.cz - Added inst_upgrade_urls client which offers URLs used on the - system to be used during the upgrade as well. + system to be used during the upgrade as well (FATE #301785). - Calling the client from control file. +- Adjusted RPM dependencies (.anyxml SCR agent). - 2.15.37 ------------------------------------------------------------------- Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Mon Jul 30 12:47:05 2007 @@ -15,8 +15,8 @@ # Language::selection_skipped, bugzilla #223258 Requires: yast2-country >= 2.15.0 Requires: yast2-network >= 2.15.37 -# inst_productsources client moved to... -Requires: yast2-packager >= 2.15.45 +# .anyxml SCR agent +Requires: yast2-packager >= 2.15.51 # Only in inst-sys # Requires: yast2-add-on -- 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] r39761 - in /trunk/installation: control/control.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 12:44:11 2007 New Revision: 39761 URL: http://svn.opensuse.org/viewcvs/yast?rev=39761&view=rev Log: - Calling the client from control file. Modified: trunk/installation/control/control.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml… ============================================================================== --- trunk/installation/control/control.xml (original) +++ trunk/installation/control/control.xml Mon Jul 30 12:44:11 2007 @@ -354,9 +354,14 @@ <enable_next>yes</enable_next> </module> <module> + <name>upgrade_url</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> <label>Add-On Products</label> <name>add-on</name> - <enable_back>no</enable_back> + <enable_back>yes</enable_back> <enable_next>yes</enable_next> </module> <module> 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 Jul 30 12:44:11 2007 @@ -3,6 +3,7 @@ - Added inst_upgrade_urls client which offers URLs used on the system to be used during the upgrade as well. +- Calling the client from control file. - 2.15.37 ------------------------------------------------------------------- -- 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] r39760 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 12:40:09 2007 New Revision: 39760 URL: http://svn.opensuse.org/viewcvs/yast?rev=39760&view=rev Log: - Added inst_upgrade_urls client which offers URLs used on the system to be used during the upgrade as well. - 2.15.37 Added: trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=39760&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Jul 30 12:40:09 2007 @@ -1 +1 @@ -2.15.36 +2.15.37 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 Jul 30 12:40:09 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 30 12:38:31 CEST 2007 - locilka(a)suse.cz + +- Added inst_upgrade_urls client which offers URLs used on the + system to be used during the upgrade as well. +- 2.15.37 + +------------------------------------------------------------------- Sun Jul 29 22:39:31 CEST 2007 - locilka(a)suse.cz - Fixed curl parameters for network test in first stage (#295484). Added: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (added) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Mon Jul 30 12:40:09 2007 @@ -0,0 +1,510 @@ +{ + // FATE #301785: Distribution upgrade should offer + // existing extra installation sources as Add-On + + import "Installation"; + import "FileUtils"; + import "Stage"; + import "GetInstArgs"; + import "FileUtils"; + import "Mode"; + import "Wizard"; + import "Progress"; + import "Label"; + import "NetworkService"; + import "Popup"; + import "AddOnProduct"; + + textdomain "installation"; + + symbol ret = `next; + if (GetInstArgs::going_back()) ret = `back; + + // --> Comment this out in case of testing on a running system + if (! Stage::initial()) { + y2milestone ("Not an initial stage"); + return ret; + } + if (! Mode::update()) { + y2milestone ("Not an udpate mode"); + return ret; + } + // <-- + + string dir_old = sformat ("%1/var/lib/zypp/db/sources/", Installation::destdir); + list <map <string, any> > old_urls = []; + + string dir_new = sformat ("%1/etc/zypp/repos.d/", Installation::destdir); + list <map> new_urls = []; + + list <map> already_registered_repos = []; + + void ReadOldTypeURLs () { + // Old-type URLs + list <string> all_source_files = (list <string>) SCR::Read (.target.dir, dir_old); + + if (all_source_files == nil || all_source_files == []) { + y2milestone ("No old zypp sources on the target"); + } else { + integer counter = -1; + + foreach (string one_source_file, all_source_files, { + one_source_file = sformat ("%1/%2", dir_old, one_source_file); + + if (! FileUtils::Exists (one_source_file)) { + y2error ("File doesn't exist: %1", one_source_file); + return; + } + + map xmlcontent = (map) SCR::Read (.anyxml, one_source_file); + + counter = counter + 1; + map <string, any> one_old_url = $[ + "url" : xmlcontent["source","url","value"]:nil, + "enabled" : xmlcontent["source","enabled","value"]:false, + "name" : xmlcontent["source","alias","value"]:nil, + ]; + + old_urls[counter] = one_old_url; + }); + + y2milestone ("URLs: %1", old_urls); + } + } + + void ReadNewTypeURLs () { + // New-type URLs + new_urls = (list <map>) SCR::Read (.zypp_repos, dir_new); + + if (new_urls == nil || new_urls == []) { + y2milestone ("No new zypp sources on the target"); + } else { + y2milestone ("URLs: %1", new_urls); + } + } + + void CreateListTableUI () { + Wizard::SetContents ( + // TRANSLATORS: dialog caption + _("Previously Used Repositories"), + `VBox ( + // TRANSLATORS: dialog text, possibly multiline, + // Please, do not use more than 50 characters per line. + `Left (`Label (_("These repositories were found on the system +you are just upgrading:"))), + `Table ( + `id ("table_of_repos"), + `opt (`notify), + `header ( + // TRANSLATORS: Table header item + _("Current Status"), + // TRANSLATORS: Table header item + _("Repository"), + // TRANSLATORS: Table header item + _("URL") + ), + [] + ), + `HBox ( + // TRANSLATORS: Push button + `PushButton (`id (`edit), _("&Change...")), + `HSpacing (1), + // TRANSLATORS: Push button + `PushButton (`id (`toggle), _("&Toggle Status")), + `HStretch() + ) + ), + // TRANSLATORS: help text 1/3 + _("Here you can see all software repositories that were found +on the system you are just upgrading. You have better enable +those you want to include in the upgrade process.") + + // TRANSLATORS: help text 2/3 + _("To enable or disable an URL, click on the +Toggle Status button or double-click on the respective table item.") + + // TRANSLATORS: help text 3/3 + _("To change the URL, click on the Change... button."), + true, + true + ); + Wizard::SetTitleIcon ("yast-sw_source"); + } + + list <map> urls = []; + + void RedrawListTableUI () { + integer currentitem = (integer) UI::QueryWidget (`id ("table_of_repos"), `CurrentItem); + + integer counter = -1; + list <term> items = maplist (map one_url, urls, { + counter = counter + 1; + return `item ( + `id (counter), + (one_url["url_will_be_enabled"]:false ? + // TRANSLATORS: Table item status (repository) + _("Enabled") + : + // TRANSLATORS: Table item status (repository) + _("Disabled") + ), + // TRANSLATORS: Fallback name for a repository + one_url["name"]:_("Unknown"), + one_url["url"]:"" + ); + }); + + UI::ChangeWidget (`id ("table_of_repos"), `Items, items); + + if (currentitem != nil) { + UI::ChangeWidget (`id ("table_of_repos"), `CurrentItem, currentitem); + } + } + + boolean FindCurrentURLStatus (string baseurl) { + if (baseurl == "" || baseurl == nil) { + y2error ("Base URL not defined!"); + return false; + } + + boolean ret = false; + + foreach (map one_url, already_registered_repos, { + if (baseurl == one_url["media_url"]:"-A-") { + ret = true; + break; + } + }); + + return ret; + } + + integer FindURLMediaNr (string baseurl) { + if (baseurl == "" || baseurl == nil) { + y2error ("Base URL not defined!"); + return nil; + } + + integer ret = nil; + + foreach (map one_url, already_registered_repos, { + if (baseurl == one_url["media_url"]:"-A-") { + ret = one_url["media"]:-1; + break; + } + }); + + return ret; + } + + string FindURLName (string baseurl) { + if (baseurl == "" || baseurl == nil) { + y2error ("Base URL not defined!"); + return nil; + } + + string ret = nil; + + foreach (map one_url, already_registered_repos, { + if (baseurl == one_url["media_url"]:"-A-") { + ret = one_url["name"]:""; + break; + } + }); + + return ret; + } + + void EditItem (integer currentitem) { + if (currentitem == nil || currentitem < 0) { + y2error ("Cannot edit item: %1", currentitem); + return; + } + + string url = urls[currentitem, "url"]:""; + integer min_width = size (url); + + UI::OpenDialog ( + `VBox ( + // TRANSLATORS: textentry + `MinWidth (min_width, `TextEntry (`id (`url), _("&Repository URL"), url)), + `VSpacing (1), + `HBox ( + `PushButton (`id (`ok), Label::OKButton()), + `HSpacing (2), + `PushButton (`id (`cancel), Label::CancelButton()) + ) + ) + ); + + any ret = UI::UserInput (); + url = (string) UI::QueryWidget (`id (`url), `Value); + UI::CloseDialog(); + + if (ret == `cancel) { + return; + } + + urls[currentitem, "url"] = url; + } + + symbol HandleOldSources () { + urls = []; + + // If some new (since 10.3 Alpha?) URLs found, use only them + if (new_urls != nil && new_urls != []) { + foreach (map one_url_map, new_urls, { + urls = add (urls, $[ + "url" : one_url_map["baseurl"]:nil, + "name" : (one_url_map["name"]:"" == "" ? one_url_map["id"]:"" : one_url_map["name"]:""), + "enabled" : one_url_map["enabled"]:false, + ]); + }); + // Fallback, old URLs found + // 10.1, 10.2, 10.3 ... + } else if (old_urls != nil && old_urls != []) { + urls = old_urls; + } + + urls = maplist (map one_url, urls, { + one_url["url_will_be_enabled"] = FindCurrentURLStatus (tostring (one_url["url"]:"")); + one_url["initial_url_status"] = one_url["url_will_be_enabled"]:false; + return one_url; + }); + + y2milestone ("Offering: %1", urls); + y2milestone ("Already registered: %1", already_registered_repos); + + CreateListTableUI(); + RedrawListTableUI(); + + symbol ret = `next; + any ui_ret = nil; + + while (true) { + ui_ret = UI::UserInput(); + + if (ui_ret == "table_of_repos") ui_ret = `toggle; + + if (ui_ret == `toggle) { + integer currentitem = (integer) UI::QueryWidget (`id ("table_of_repos"), `CurrentItem); + if (currentitem != nil) { + urls[currentitem, "url_will_be_enabled"] = (! urls[currentitem,"url_will_be_enabled"]:false); + RedrawListTableUI(); + } + continue; + } else if (ui_ret == `next) { + ret = `next; + break; + } else if (ui_ret == `back) { + ret = `back; + break; + } else if (ui_ret == `abort) { + ret = `abort; + break; + } else if (ui_ret == `edit) { + integer currentitem = (integer) UI::QueryWidget (`id ("table_of_repos"), `CurrentItem); + EditItem (currentitem); + RedrawListTableUI(); + } else { + y2error ("Unknown UI input: %1", ui_ret); + } + } + + return ret; + } + + boolean NetworkRunning () { + boolean ret = false; + + while (true) { + if (NetworkService::isNetworkRunning()) { + ret = true; + break; + } + + // Network is not running + if (! Popup::AnyQuestion ( + // TRANSLATORS: popup header + _("Network is not Configured"), + // TRANSLATORS: popup question + _("Remote repositories require the Internet connection. + +Would you like to configure it?"), + Label::YesButton(), + Label::NoButton(), + `yes + )) { + y2milestone ("User decided not to setup the network"); + ret = false; + break; + } + + y2milestone ("User wants to setup the network"); + // Call network-setup client + any netret = WFM::call("inst_network_setup"); + + if (netret == `abort) { + y2milestone ("Aborting the network setup"); + break; + } + } + + return ret; + } + + void SetAddRemoveSourcesUI () { + Wizard::SetContents ( + // TRANSLATORS: dialog caption + _("Previously Used Repositories"), + `VBox ( + // TRANSLATORS: Progress text + `Label (_("Adding and removing repositories...")) + ), + // TRANSLATORS: help text + _("Please wait while repositories are being added and removed."), + false, + false + ); + Wizard::SetTitleIcon ("yast-sw_source"); + } + + symbol AddOrRemoveSources () { + list <integer> sources_to_remove = []; + list <string> sources_to_add = []; + + + + foreach (map one_source, urls, { + string url = one_source["url"]:""; + integer current_medianr = FindURLMediaNr (url); + + // Source should be enabled at the end + if (one_source["url_will_be_enabled"]:nil == true) { + if (current_medianr == nil) { + sources_to_add = add (sources_to_add, url); + } + // Source should be disabled at the end + } else if (one_source["url_will_be_enabled"]:nil == false) { + if (current_medianr != nil) { + sources_to_remove = add (sources_to_remove, current_medianr); + } + } + }); + + if (size(sources_to_remove) > 0 || size (sources_to_add) > 0) { + SetAddRemoveSourcesUI(); + } + + y2milestone ("Deleting repos: %1", sources_to_remove); + foreach (integer one_id, sources_to_remove, { + Pkg::SourceDelete (one_id); + + AddOnProduct::add_on_products = (list <map <string, any> >) filter ( + map one_addon, AddOnProduct::add_on_products, { + return one_addon["media"]:-42 != one_id; + } + ); + + }); + + // Remote repositories need network + if ((size(sources_to_add) > 0) && NetworkRunning()) { + y2milestone ("Adding repos: %1", sources_to_add); + foreach (string one_url, sources_to_add, { + integer new_id = Pkg::SourceCreate (one_url, "/"); + if (new_id > -1) { + AddOnProduct::add_on_products = add ( + AddOnProduct::add_on_products, + $[ + "media" : new_id, + "media_url" : one_url, + "product_dir" : "/", + "product" : FindURLName (one_url), + "autoyast_product" : "", + ] + ); + } + }); + } + + return `next; + } + + void SetProgressUI () { + Progress::New ( + // TRANSLATORS: dialog caption + _("Reading Repositories Used on the System"), + " ", + 2, + [ + // TRANSLATORS: progress step + _("Read previously used repositories"), + _("Initialize package manager"), + ], + [ + // TRANSLATORS: progress step + _("Reading previously used repositories..."), + _("Initializing package manager..."), + ], + // TRANSLATORS: dialog help + _("Please wait, while repositories are being read...") + ); + Wizard::SetTitleIcon ("yast-sw_source"); + } + + // for testing purpose + if (Mode::normal()) Wizard::CreateDialog(); + + SetProgressUI(); + Progress::NextStage(); + + // Read the old repos (old type) + if (FileUtils::Exists (dir_old)) + ReadOldTypeURLs (); + else + y2milestone ("Skipping ReadOldTypeURLs()"); + + // Read the old repos (new type) + if (FileUtils::Exists (dir_new)) + ReadNewTypeURLs (); + else + y2milestone ("Skipping ReadNewTypeURLs()"); + Progress::NextStage(); + + boolean continue_processing = false; + if ((old_urls != nil && old_urls != []) || (new_urls != nil && new_urls != [])) { + continue_processing = true; + // initialize zypp + Pkg::TargetInitialize (Installation::destdir); + Pkg::SourceStartManager (false); + + foreach (integer one_id, Pkg::SourceGetCurrent (true), { + map source_data = Pkg::SourceGeneralData (one_id); + + already_registered_repos = add (already_registered_repos, $[ + "media_url" : source_data["url"]:"", + "product_dir" : source_data["product_dir"]:"", + "media" : one_id, + ]); + }); + } + + Progress::NextStage(); + Progress::Finish(); + + if (! continue_processing) { + y2milestone ("No sources found"); + return ret; + } + + ret = HandleOldSources(); + if (ret == `next) ret = AddOrRemoveSources(); + + // for testing purpose + if (Mode::normal()) { + if (ret == `next) Pkg::SourceSaveAll(); + Wizard::CloseDialog(); + } + + y2milestone ("Returning %1", ret); + return ret; +} \ No newline at end of file -- 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] r39759 - /trunk/installation/src/clients/inst_network_setup.ycp
by locilka＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: locilka Date: Mon Jul 30 12:06:22 2007 New Revision: 39759 URL: http://svn.opensuse.org/viewcvs/yast?rev=39759&view=rev Log: Even better (correct ;)) curl command Modified: trunk/installation/src/clients/inst_network_setup.ycp Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Mon Jul 30 12:06:22 2007 @@ -1127,7 +1127,10 @@ "http://www.opensuse.org", "http://www.suse.com" ], { - string cmd = sformat ("curl --header --max-time=45 --connect-timeout 30 '%1' 1>/dev/null", String::Quote (www_address)); + string cmd = sformat ( + "curl --silent --show-error --max-time 45 --connect-timeout 30 '%1' 1>/dev/null", + String::Quote (www_address) + ); map run_cmd = (map) SCR::Execute (.target.bash_output, cmd); y2milestone ("Running %1 returned %2", cmd, run_cmd); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0