April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56616 - /trunk/autoinstallation/src/modules/AutoinstScripts.ycp
by ug＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: ug Date: Fri Apr 3 13:26:27 2009 New Revision: 56616 URL: http://svn.opensuse.org/viewcvs/yast?rev=56616&view=rev Log: c&p bug Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Fri Apr 3 13:26:27 2009 @@ -318,7 +318,7 @@ summary = Summary::AddLine(summary, Summary::NotConfigured()); } summary = Summary::AddHeader(summary, _("Postpartitioning Scripts")); - if (size( init) > 0 ) + if (size( postpart ) > 0 ) { summary = Summary::OpenList(summary); foreach(map script, postpart, ``{ -- 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] r56615 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml doc/examples/example.scripts.xml package/autoyast2.changes src/clients/inst_autoimage.ycp src/modules/AutoinstScripts.ycp
by ug＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: ug Date: Fri Apr 3 13:08:57 2009 New Revision: 56615 URL: http://svn.opensuse.org/viewcvs/yast?rev=56615&view=rev Log: postpartitioning script invented Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/doc/examples/example.scripts.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoimage.ycp trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Apr 3 13:08:57 2009 @@ -2051,12 +2051,13 @@ installation. </para> <para> - In the auto-installation process, four types of scripts can be executed and they + In the auto-installation process, five types of scripts can be executed and they will be described here in order of "appearance" during the installation. </para> <para> <itemizedlist> <listitem><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</listitem> + <listitem><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</listitem> <listitem><emphasis>chroot-scripts</emphasis> (after the package installation, before the first boot)</listitem> <listitem><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</listitem> <listitem><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</listitem> @@ -2153,6 +2154,85 @@ </table> </para> </section> + + <section id="postpartitioning-install.scripts"> + <title>Postpartitioning Scripts</title> + <note> + <para>Available starting from openSUSE 11.2 only (not SLES11).</para> + </note> + <para> + Executed after &yast2; did the partitioning and wrote the fstab. The empty system is mounted to /mnt already. + This type of script is available since openSUSE 11.2 (not SLES11). + </para> + <para> + The following elements must be between the <postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-sripts> tags + </para> + <para> + <table frame='top'> + <title>postpartitioning script XML representation</title> + <tgroup cols="3"> + <thead> + <row> + <entry>Element</entry> + <entry>Description</entry> + <entry>Comment</entry> + </row> + </thead> + <tbody> + <row> + <entry>location</entry> + <entry>you can define a location from where the script gets fetched. + Locations can be the same like for the profile (http,ftp,nfs,...). + <para><screen><location>http://10.10.0.1/myScript.sh</location></screen></para></entry> + <entry>either <location> or <source> must be defined</entry> + </row> + <row> + <entry>source</entry> + <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + to put the whole shell script into the XML profile, look at the location parameter. + + <para><screen><source> +<![CDATA[ +echo "Testing postpart script" > /mnt/postpart_test.txt +]]> +</source></screen></para></entry> + <entry>Either <location> or <source> must be defined</entry> + </row> + <row> + <entry>interpreter</entry> + <entry>the interpreter that must be used for the script. Supported options are shell and perl. + <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry>optional (default is shell)</entry> + </row> + <row> + <entry>filename</entry> + <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... + <para><screen><filename>myScript5.sh</filename></screen></para></entry> + <entry>optional. The default is the type of the script (pre-scripts) in this case</entry> + </row> + <row> + <entry>feedback</entry> + <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so + no confirmation is needed. + <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> + </row> + <row> + <entry>debug</entry> + <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + turned on. + <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> + </row> + </tbody> + </tgroup> + </table> + </para> + </section> + + + <section id="chroot.scripts"> <title>Chroot environment scripts</title> <para>Chroot scripts are executed before the machine reboots for the first time. Modified: trunk/autoinstallation/doc/examples/example.scripts.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/examples/ex… ============================================================================== --- trunk/autoinstallation/doc/examples/example.scripts.xml (original) +++ trunk/autoinstallation/doc/examples/example.scripts.xml Fri Apr 3 13:08:57 2009 @@ -68,5 +68,18 @@ </source> </script> </pre-scripts> + <postpartitioning-scripts config:type="list"> + <script> + <filename>postpart.sh</filename> + <interpreter>shell</interpreter> + <debug config:type="boolean">false</debug> + <feedback config:type="boolean">true</feedback> + <source><![CDATA[ +touch /mnt/testfile +echo Hi +]]> + </source> + </script> + </postpartitioning-scripts> </scripts> </profile> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Apr 3 13:08:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 3 13:08:47 CEST 2009 - ug(a)suse.de + +- postpartitioning script invented + +------------------------------------------------------------------- Wed Apr 1 16:11:08 CEST 2009 - ug(a)suse.de - storage lib compatibility with "used_by" Modified: trunk/autoinstallation/src/clients/inst_autoimage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoimage.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoimage.ycp Fri Apr 3 13:08:57 2009 @@ -16,6 +16,9 @@ import "Report"; import "AutoinstImage"; import "AutoinstSoftware"; +import "AutoinstScripts"; + +AutoinstScripts::Write("postpartitioning-scripts", false); if (!AutoinstSoftware::imaging) return `auto; Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Fri Apr 3 13:08:57 2009 @@ -33,6 +33,10 @@ /* Init scripts */ global list<map> init = []; + /* postpart scripts */ + global list<map> postpart = []; + + /* Merged scripts */ global list<map> merged = []; @@ -89,6 +93,12 @@ return p; }) ); + result = (list<map>)union(result, maplist (map p, postpart, + ``{ + p = add(p,"type","postpartitioning-scripts"); + return p; + }) + ); return result; } @@ -115,6 +125,7 @@ post = []; chroot = []; init = []; + postpart = []; y2milestone("Merged %1", merged); // split @@ -127,6 +138,8 @@ init = add(init,s); else if (s["type"]:"" == "chroot-scripts") chroot = add(chroot,s); + else if (s["type"]:"" == "postpartitioning-scripts") + postpart = add(postpart,s); }); @@ -168,6 +181,16 @@ "debug":p["debug"]:true ]); }); + list<map> expostpart = maplist (map p, postpart, ``{ + return ($["filename":p["filename"]:"", + "interpreter": p["interpreter"]:"", + "source":p["source"]:"", + "location":p["location"]:"", + "feedback":p["feedback"]:false, + "debug":p["debug"]:true + ]); + }); + map<string, list> result = $[]; if (size(expre) > 0 ) result["pre-scripts"] = expre; @@ -177,6 +200,8 @@ result["chroot-scripts"] = exchroot; if (size(exinit) > 0 ) result["init-scripts"] = exinit; + if (size(expostpart) > 0 ) + result["postpartitioning-scripts"] = expostpart; return result; @@ -220,11 +245,13 @@ init = s["init-scripts"]:[]; post = s["post-scripts"]:[]; chroot = s["chroot-scripts"]:[]; + postpart = s["postpartitioning-scripts"]:[]; pre = Resolve_relurl(pre); init = Resolve_relurl(init); post = Resolve_relurl(post); chroot = Resolve_relurl(chroot); + postpart = Resolve_relurl(postpart); merged = mergeScripts(); y2debug("merged: %1", merged); @@ -290,6 +317,19 @@ { summary = Summary::AddLine(summary, Summary::NotConfigured()); } + summary = Summary::AddHeader(summary, _("Postpartitioning Scripts")); + if (size( init) > 0 ) + { + summary = Summary::OpenList(summary); + foreach(map script, postpart, ``{ + summary = Summary::AddListItem(summary, script["filename"]:"" ); + }); + summary = Summary::CloseList(summary); + } + else + { + summary = Summary::AddLine(summary, Summary::NotConfigured()); + } return summary; } @@ -388,6 +428,10 @@ { return _("Chroot"); } + else if (type == "postpartitioning-scripts") + { + return _("Postpartitioning"); + } return _("Unknown"); } @@ -549,6 +593,10 @@ { scripts = filter(map s, post, ``(s["network_needed"]:false)); } + else if (type == "postpartitioning-scripts" ) + { + scripts = postpart; + } else { y2error("Unsupported script type"); @@ -559,7 +607,7 @@ string tmpdirString = ""; string current_logdir = ""; - if (type == "pre-scripts") + if (type == "pre-scripts" || type == "postpartitioning-scripts") { tmpdirString = sformat("%1/%2", AutoinstConfig::tmpDir, type); SCR::Execute (.target.mkdir, tmpdirString); @@ -600,12 +648,12 @@ } string scriptPath = ""; - if (type == "pre-scripts") + if ( type == "pre-scripts" || type == "postpartitioning-scripts" ) { // y2milestone("doing /sbin/udevcontrol stop_exec_queue now to prevent trouble if one is doing partitioning in a pre-script"); // SCR::Execute( .target.bash, "/sbin/udevcontrol stop_exec_queue" ); scriptPath = sformat("%1/%2/%3", AutoinstConfig::tmpDir, type, scriptName); - y2milestone("Writing pre script into %1", scriptPath); + y2milestone("Writing %1 script into %2", type, scriptPath); if (s["location"]:"" != "") { y2debug("getting script: %1", s["location"]:"" ); -- 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] r56614 - in /branches/tmp/SLE-11-SP1-Stash/tv: ./ package/yast2-tv.changes src/irc_ui.ycp src/misc.ycp
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 12:50:12 2009 New Revision: 56614 URL: http://svn.opensuse.org/viewcvs/yast?rev=56614&view=rev Log: - Display more details in lirc error popup, describe the details (bnc#449327) Modified: branches/tmp/SLE-11-SP1-Stash/tv/ (props changed) branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp Modified: branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/packa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes Fri Apr 3 12:50:12 2009 @@ -3,6 +3,8 @@ - Do not try installing unavailable packages (TV applications) (bnc #480179) +- Display more details in lirc error popup, describe the details + (bnc#449327) ------------------------------------------------------------------- Mon Dec 15 15:57:10 CET 2008 - lslezak(a)suse.cz Modified: branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/src/i… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp Fri Apr 3 12:50:12 2009 @@ -39,10 +39,10 @@ * start with temporary LIRC configuration to enable the test * @return empty string on success, error message otherwise */ - define string lirc_tmp_start () ``{ + define map lirc_tmp_start () ``{ if (!modified) - return ""; + return $[]; // store old configuration orig_module = (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE); if (SCR::Read (.target.size, "/etc/lircd.conf") != -1) @@ -69,7 +69,7 @@ out = (map) SCR::Execute (.target.bash_output, "rclirc restart"); else out = (map) SCR::Execute (.target.bash_output, "rclirc start"); - return out["stderr"]:""; + return out; } /** @@ -99,11 +99,11 @@ `Label(_("Initializing...")) ); - string start = lirc_tmp_start (); - if (start != "") + map start = lirc_tmp_start (); + if (start["exit"]:-1 != 0) { // error popup text - ErrorWithDetails (_("Starting the 'lirc' service failed."), start); + ErrorWithDetails (_("Starting the 'lirc' service failed."), _("Output from /etc/init.d/lirc command:\n\n") + start["stdout"]:"" + "\n" + start["stderr"]:""); UI::CloseDialog(); lirc_tmp_stop (); return false; Modified: branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/src/m… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp Fri Apr 3 12:50:12 2009 @@ -95,7 +95,7 @@ `VSpacing (0.5), // label `Left(`Heading (Label::ErrorMsg())), - `Label (error), + `Left(`Label (error)), `ReplacePoint (`id(`rp), `Empty()), `VSpacing (0.5), `Left(`CheckBox (`id(`details), `opt (`notify), @@ -113,7 +113,7 @@ if (ret == `details) { if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox (`Label (details))); + UI::ReplaceWidget (`id(`rp), `Frame(_("Details"), `Left(`Label (details)))); else UI::ReplaceWidget (`id(`rp), `Empty()); } -- 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] r56613 - in /branches/tmp/SLE-11-SP1-Stash/tv: ./ package/yast2-tv.changes src/Tv.ycp
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 12:48:36 2009 New Revision: 56613 URL: http://svn.opensuse.org/viewcvs/yast?rev=56613&view=rev Log: - Do not try installing unavailable packages (TV applications) (bnc #480179) Modified: branches/tmp/SLE-11-SP1-Stash/tv/ (props changed) branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes branches/tmp/SLE-11-SP1-Stash/tv/src/Tv.ycp Modified: branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/packa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes Fri Apr 3 12:48:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 10:02:21 CEST 2009 - lslezak(a)suse.cz + +- Do not try installing unavailable packages (TV applications) + (bnc #480179) + +------------------------------------------------------------------- Mon Dec 15 15:57:10 CET 2008 - lslezak(a)suse.cz - reload the driver to activate the changed module options Modified: branches/tmp/SLE-11-SP1-Stash/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/src/T… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/src/Tv.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/src/Tv.ycp Fri Apr 3 12:48:36 2009 @@ -297,7 +297,7 @@ * @param apps list of applications to install * @param text text to show in dialog */ - define void InstallApplication (list apps, string text) ``{ + define void InstallApplication (list<string> apps, string text) ``{ UI::OpenDialog (`opt(`decorated), `VBox( `HSpacing(50), @@ -321,13 +321,7 @@ UI::CloseDialog(); if (ret == `ok) { - list<string> to_install = []; - // check if packages are avialable... - foreach (string app, (list<string>) apps, ``{ - if (Package::Available (app)) - to_install = add (to_install, app); - }); - Package::InstallAll (to_install); + Package::InstallAll (apps); } } @@ -3590,35 +3584,48 @@ y2milestone("Detected TV card: %1, Radio card: %2", tv, radio); - if (Package::Installed ("gnome-panel")) - tv_app = "motv"; - else if (Package::Installed("kdelibs3") || Package::Installed("kdelibs4")) - tv_app = "kdetv"; - - boolean tv_app_installed = Package::Installed (tv_app); - boolean radio_app_installed = Package::Installed ("kradio"); - list<string> apps = [ tv_app ]; + list<string> apps = [ ]; + boolean kde = Package::Installed("kdelibs3") || Package::Installed("kdelibs4"); - if (!Package::Installed("alevt")) + if (tv) { - apps = add(apps, "alevt"); + if (Package::Installed ("gnome-panel")) + tv_app = "motv"; + else if (kde) + { + tv_app = "kdetv"; + } + + if (!Package::Installed(tv_app) && Package::Available(tv_app) == true) + { + apps = add(apps, tv_app); + } + + if (!Package::Installed("alevt") && Package::Available("alevt") == true) + { + apps = add(apps, "alevt"); + } + + if (!Package::Installed("nxtvepg") && Package::Available("nxtvepg") == true) + { + apps = add(apps, "nxtvepg"); + } + + y2milestone("TV packages to install: %1", apps); } - if (!Package::Installed("nxtvepg")) + if (radio && kde && !Package::Installed("kradio") && Package::Available("kradio") == true) { - apps = add(apps, "nxtvepg"); + y2milestone("Adding kradio to the package list"); + apps = add(apps, "kradio"); } - y2milestone("TV application: %1, installed: %2", tv_app, tv_app_installed); - y2milestone("Radio applications installed: %1", radio_app_installed); - y2milestone("Applications to install: %1", apps); + y2milestone("Packages to install: %1", apps); - // do not propose kradio application if we have not KDE - if (radio && tv && !tv_app_installed && !radio_app_installed && - tv_app == "kdetv") + // installing radio and TV applications + if (contains(apps, "kradio") && size(apps) > 1) { // Popup text (required application are %1): - apps = add (apps, "kradio"); InstallApplication (apps, sformat(_("<p>To enable you to watch TV and listen to radio on your computer,<br> these packages should be installed:<br> <b>%1</b><br> @@ -3626,7 +3633,8 @@ </p> "), mergestring (apps, ", "))); } - else if (tv && !tv_app_installed) + // installing only TV applications + else if (!contains(apps, "kradio") && size(apps) > 0) { // Popup text (required application are %1): InstallApplication (apps, sformat(_("<p>To enable you to watch TV on your computer,<br> @@ -3636,7 +3644,8 @@ </p> "), mergestring (apps, ", "))); } - else if (radio && !radio_app_installed && tv_app == "kdetv") + // installing only radio application + else if (apps == ["kradio"]) { // Popup text (required application is %1): InstallApplication (["kradio"], sformat (_("<p>To listen to radio on your computer, you can use the <b>%1</b> application. -- 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] r56612 - in /branches/tmp/SLE-11-SP1-Stash/network: package/yast2-network.changes src/services/proxy.ycp
by kmachalkova＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: kmachalkova Date: Fri Apr 3 12:39:29 2009 New Revision: 56612 URL: http://svn.opensuse.org/viewcvs/yast?rev=56612&view=rev Log: we need #490661 (subnet definition) fixed in SP1 too Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/services/proxy.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Fri Apr 3 12:39:29 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 3 12:36:53 CEST 2009 - kmachalkova(a)suse.cz + +- Allow '/' character in NO_PROXY (subnet definition - bnc#490661) + +------------------------------------------------------------------- Thu Apr 2 23:07:49 CEST 2009 - mzugec(a)suse.de - fixed additional addresses with bonding (bnc#420074) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/services/proxy.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/services/proxy.ycp Fri Apr 3 12:39:29 2009 @@ -401,7 +401,8 @@ UI::ChangeWidget(`id(`http), `ValidChars, URL::ValidChars); UI::ChangeWidget(`id(`https), `ValidChars, URL::ValidChars); UI::ChangeWidget(`id(`ftp), `ValidChars, URL::ValidChars); - UI::ChangeWidget(`id(`no), `ValidChars, Hostname::ValidCharsDomain + " ,"); + // '/' character for subnets definition - #490661 + UI::ChangeWidget(`id(`no), `ValidChars, Hostname::ValidCharsDomain + " ,/"); UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); UI::ChangeWidget(`id(`frame1), `Enabled, enabled); UI::ChangeWidget(`id(`frame2), `Enabled, enabled); -- 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] r56611 - in /trunk/yast2: package/yast2.changes scripts/save_y2logs
by jsrain＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: jsrain Date: Fri Apr 3 12:30:22 2009 New Revision: 56611 URL: http://svn.opensuse.org/viewcvs/yast?rev=56611&view=rev Log: save_y2logs additionally collects /var/log/zypper.log and /var/log/pk_backend_zypp Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/save_y2logs 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 Fri Apr 3 12:30:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 12:29:54 CEST 2009 - jsrain(a)suse.cz + +- save_y2logs additionally collects /var/log/zypper.log and + /var/log/pk_backend_zypp + +------------------------------------------------------------------- Wed Mar 25 16:41:53 CET 2009 - lslezak(a)suse.cz - Fixed layout of the authentication popup Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=56… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Fri Apr 3 12:30:22 2009 @@ -65,6 +65,14 @@ LIST="$LIST /var/log/Xorg.0.log" fi +if [ -f /var/log/zypper.log ]; then + LIST="$LIST /var/log/zypper.log" +fi + +if [ -f /var/log/pk_backend_zypp ]; then + LIST="$LIST /var/log/pk_backend_zypp" +fi + RPM_LIST="rpm-qa" if [ -f /var/lib/rpm/Packages ]; then rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST -- 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] r56610 - /tags/stable-2_18_2/tv/
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 12:10:02 2009 New Revision: 56610 URL: http://svn.opensuse.org/viewcvs/yast?rev=56610&view=rev Log: Created tag stable-2_18_2 for tv Added: tags/stable-2_18_2/tv/ - copied from r56609, trunk/tv/ -- 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] r56609 - in /trunk/storage/libstorage/src: Volume.cc Volume.h
by aschnell＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: aschnell Date: Fri Apr 3 12:06:12 2009 New Revision: 56609 URL: http://svn.opensuse.org/viewcvs/yast?rev=56609&view=rev Log: - added some const Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri Apr 3 12:06:12 2009 @@ -1078,12 +1078,12 @@ } -int Volume::checkDevice() +int Volume::checkDevice() const { return( checkDevice(dev)); } -int Volume::checkDevice( const string& device ) +int Volume::checkDevice(const string& device) const { struct stat sbuf; int ret = 0; @@ -1799,7 +1799,7 @@ return( ret ); } -string Volume::getDmcryptName() +string Volume::getDmcryptName() const { string nm; if( cont->type()!=LOOP ) Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?… ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Fri Apr 3 12:06:12 2009 @@ -197,8 +197,8 @@ protected: void init(); void setNameDev(); - int checkDevice(); - int checkDevice( const string& device ); + int checkDevice() const; + int checkDevice(const string& device) const; storage::MountByType defaultMountBy( const string& mp="" ); bool allowedMountBy( storage::MountByType mby, const string& mp="" ); void getFsData( SystemCmd& blkidData ); @@ -216,7 +216,7 @@ void getFstabOpts( std::list<string>& ol ); bool getLoopFile( string& fname ) const; void setExtError( const SystemCmd& cmd, bool serr=true ); - string getDmcryptName(); + string getDmcryptName() const; bool needLosetup() const; bool needCryptsetup() const; int doLosetup(); -- 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] r56608 - in /trunk/tv: VERSION package/yast2-tv.changes src/irc_ui.ycp src/misc.ycp
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 11:59:05 2009 New Revision: 56608 URL: http://svn.opensuse.org/viewcvs/yast?rev=56608&view=rev Log: - Display more details in lirc error popup, describe the details (bnc#449327) - 2.18.2 Modified: trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/irc_ui.ycp trunk/tv/src/misc.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=56608&r1=56607&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Fri Apr 3 11:59:05 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri Apr 3 11:59:05 2009 @@ -3,6 +3,9 @@ - Do not try installing unavailable packages (TV applications) (bnc #480179) +- Display more details in lirc error popup, describe the details + (bnc#449327) +- 2.18.2 ------------------------------------------------------------------- Thu Mar 26 08:20:36 CET 2009 - lslezak(a)suse.cz Modified: trunk/tv/src/irc_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/irc_ui.ycp?rev=56608&r1=5… ============================================================================== --- trunk/tv/src/irc_ui.ycp (original) +++ trunk/tv/src/irc_ui.ycp Fri Apr 3 11:59:05 2009 @@ -39,10 +39,10 @@ * start with temporary LIRC configuration to enable the test * @return empty string on success, error message otherwise */ - define string lirc_tmp_start () ``{ + define map lirc_tmp_start () ``{ if (!modified) - return ""; + return $[]; // store old configuration orig_module = (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE); if (SCR::Read (.target.size, "/etc/lircd.conf") != -1) @@ -69,7 +69,7 @@ out = (map) SCR::Execute (.target.bash_output, "rclirc restart"); else out = (map) SCR::Execute (.target.bash_output, "rclirc start"); - return out["stderr"]:""; + return out; } /** @@ -99,11 +99,11 @@ `Label(_("Initializing...")) ); - string start = lirc_tmp_start (); - if (start != "") + map start = lirc_tmp_start (); + if (start["exit"]:-1 != 0) { // error popup text - ErrorWithDetails (_("Starting the 'lirc' service failed."), start); + ErrorWithDetails (_("Starting the 'lirc' service failed."), _("Output from /etc/init.d/lirc command:\n\n") + start["stdout"]:"" + "\n" + start["stderr"]:""); UI::CloseDialog(); lirc_tmp_stop (); return false; Modified: trunk/tv/src/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/misc.ycp?rev=56608&r1=566… ============================================================================== --- trunk/tv/src/misc.ycp (original) +++ trunk/tv/src/misc.ycp Fri Apr 3 11:59:05 2009 @@ -95,7 +95,7 @@ `VSpacing (0.5), // label `Left(`Heading (Label::ErrorMsg())), - `Label (error), + `Left(`Label (error)), `ReplacePoint (`id(`rp), `Empty()), `VSpacing (0.5), `Left(`CheckBox (`id(`details), `opt (`notify), @@ -113,7 +113,7 @@ if (ret == `details) { if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox (`Label (details))); + UI::ReplaceWidget (`id(`rp), `Frame(_("Details"), `Left(`Label (details)))); else UI::ReplaceWidget (`id(`rp), `Empty()); } -- 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] r56607 - in /trunk/tv: package/yast2-tv.changes src/Tv.ycp
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 11:54:46 2009 New Revision: 56607 URL: http://svn.opensuse.org/viewcvs/yast?rev=56607&view=rev Log: - Do not try installing unavailable packages (TV applications) (bnc #480179) Modified: trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri Apr 3 11:54:46 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 10:02:21 CEST 2009 - lslezak(a)suse.cz + +- Do not try installing unavailable packages (TV applications) + (bnc #480179) + +------------------------------------------------------------------- Thu Mar 26 08:20:36 CET 2009 - lslezak(a)suse.cz - Use /etc/modprobe.d/50-tv.conf config file instead of Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=56607&r1=56606… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Fri Apr 3 11:54:46 2009 @@ -317,7 +317,7 @@ * @param apps list of applications to install * @param text text to show in dialog */ - define void InstallApplication (list apps, string text) ``{ + define void InstallApplication (list<string> apps, string text) ``{ any ret = `ok; @@ -346,22 +346,15 @@ if (ret == `ok) { - list<string> to_install = []; - // check if packages are avialable... - foreach (string app, (list<string>) apps, ``{ - if (Package::Available (app)) - to_install = add (to_install, app); - }); - if (ConfirmPackages()) { // display a confirmation dialog - Package::InstallAll(to_install); + Package::InstallAll(apps); } else { // do not ask the user, install the packages immediately - Package::DoInstall(to_install); + Package::DoInstall(apps); } } } @@ -3590,35 +3583,48 @@ y2milestone("Detected TV card: %1, Radio card: %2", tv, radio); - if (Package::Installed ("gnome-panel")) - tv_app = "motv"; - else if (Package::Installed("kdelibs3") || Package::Installed("kdelibs4")) - tv_app = "kdetv"; + list<string> apps = [ ]; + boolean kde = Package::Installed("kdelibs3") || Package::Installed("kdelibs4"); - boolean tv_app_installed = Package::Installed (tv_app); - boolean radio_app_installed = Package::Installed ("kradio"); - list<string> apps = [ tv_app ]; - - if (!Package::Installed("alevt")) + if (tv) { - apps = add(apps, "alevt"); + if (Package::Installed ("gnome-panel")) + tv_app = "motv"; + else if (kde) + { + tv_app = "kdetv"; + } + + if (!Package::Installed(tv_app) && Package::Available(tv_app) == true) + { + apps = add(apps, tv_app); + } + + if (!Package::Installed("alevt") && Package::Available("alevt") == true) + { + apps = add(apps, "alevt"); + } + + if (!Package::Installed("nxtvepg") && Package::Available("nxtvepg") == true) + { + apps = add(apps, "nxtvepg"); + } + + y2milestone("TV packages to install: %1", apps); } - if (!Package::Installed("nxtvepg")) + if (radio && kde && !Package::Installed("kradio") && Package::Available("kradio") == true) { - apps = add(apps, "nxtvepg"); + y2milestone("Adding kradio to the package list"); + apps = add(apps, "kradio"); } - y2milestone("TV application: %1, installed: %2", tv_app, tv_app_installed); - y2milestone("Radio applications installed: %1", radio_app_installed); - y2milestone("Applications to install: %1", apps); + y2milestone("Packages to install: %1", apps); - // do not propose kradio application if we have not KDE - if (radio && tv && !tv_app_installed && !radio_app_installed && - tv_app == "kdetv") + // installing radio and TV applications + if (contains(apps, "kradio") && size(apps) > 1) { // Popup text (required application are %1): - apps = add (apps, "kradio"); InstallApplication (apps, sformat(_("<p>To enable you to watch TV and listen to radio on your computer,<br> these packages should be installed:<br> <b>%1</b><br> @@ -3626,7 +3632,8 @@ </p> "), mergestring (apps, ", "))); } - else if (tv && !tv_app_installed) + // installing only TV applications + else if (!contains(apps, "kradio") && size(apps) > 0) { // Popup text (required application are %1): InstallApplication (apps, sformat(_("<p>To enable you to watch TV on your computer,<br> @@ -3636,7 +3643,8 @@ </p> "), mergestring (apps, ", "))); } - else if (radio && !radio_app_installed && tv_app == "kdetv") + // installing only radio application + else if (apps == ["kradio"]) { // Popup text (required application is %1): InstallApplication (["kradio"], sformat (_("<p>To listen to radio on your computer, you can use the <b>%1</b> application. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0