- YaST Commits

[yast-commit] r38275 - in /branches/SuSE-SLE-10-SP1-Branch/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by jsuchome＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jsuchome Date: Tue Jun 5 09:09:55 2007 New Revision: 38275 URL: http://svn.opensuse.org/viewcvs/yast?rev=38275&view=rev Log: - when the package selector is skipped, check if there are not licenses to show (#279491) - 2.13.60 Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION Tue Jun 5 09:09:55 2007 @@ -1 +1 @@ -2.13.59 +2.13.60 Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes Tue Jun 5 09:09:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 31 21:03:08 CEST 2007 - jsuchome(a)suse.cz + +- when the package selector is skipped, check if there are not + licenses to show (#279491) +- 2.13.60 + +------------------------------------------------------------------- Fri May 11 12:21:00 CEST 2007 - jsuchome(a)suse.cz - added support for simplified UI (#273619) Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp Tue Jun 5 09:09:55 2007 @@ -11,6 +11,7 @@ import "FileUtils"; import "GetInstArgs"; import "Internet"; + import "Label"; import "Mode"; import "OnlineUpdate"; import "OnlineUpdateCallbacks"; @@ -114,6 +115,8 @@ } integer selected = 0; + boolean check_licenses = false; + list neutralized = []; // check if there exists saved selection of patches to be installed if (FileUtils::Exists (saved_path)) @@ -157,6 +160,10 @@ return `next; } } + else if (selected > 0) + { + check_licenses = true; + } list<string> normal_patches = []; boolean reboot_needed = false; @@ -206,7 +213,53 @@ } } - + // if the package selector was not opened, ask to confirm licenses + if (check_licenses) + { + foreach (string p, Pkg::GetPackages (`selected, true), { + string license = Pkg::PkgGetLicenseToConfirm (p); + if (license != nil && license != "") + { + string rt_license = sformat ("<p><b>%1</b></p>\n%2", p, license); + if (! Popup::AnyQuestionRichText ( + // popup heading, with rich text widget and Yes/No buttons + _("Do you accept this license agreement?"), + rt_license, + 70, 20, + Label::YesButton (), Label::NoButton (), + `focus_none)) + { + y2milestone("License not accepted: %1", p); + Pkg::ResolvableNeutral (p, `package, true); + neutralized = add (neutralized, p); + } + else + { + Pkg::PkgMarkLicenseConfirmed (p); + } + } + }); + if (neutralized != []) + { + // now, neutralize also the patches related to neutralized packages + foreach (map patch, Pkg::ResolvableDependencies ("", `patch, ""), { + if (patch["status"]:`none == `selected) + { + foreach (map dep, (list<map>)patch["dependencies"]:[], { + string kind = dep["res_kind"]:""; + string pname = dep["name"]:""; + pname = substring (pname, 0, findfirstof (pname, " ")); + if ((kind == "package" || kind == "atom") && + dep["dep_kind"]:"" == "requires" && + contains (neutralized, pname)) + { + Pkg::ResolvableNeutral (patch["name"]:"", `patch, true); + } + }); + } + }); + } + } // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); -- 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] r38274 - /tags/stable-2_15_15/online-update/
by jsuchome＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jsuchome Date: Tue Jun 5 09:04:54 2007 New Revision: 38274 URL: http://svn.opensuse.org/viewcvs/yast?rev=38274&view=rev Log: Created tag stable-2_15_15 for online-update Added: tags/stable-2_15_15/online-update/ - copied from r38273, 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] r38273 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/AutoOnlineUpdate.ycp yast2-online-update.spec.in
by jsuchome＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jsuchome Date: Tue Jun 5 09:04:44 2007 New Revision: 38273 URL: http://svn.opensuse.org/viewcvs/yast?rev=38273&view=rev Log: - use zypper intseatd of rug for automatic online update (#273133) - 2.15.15 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/AutoOnlineUpdate.ycp trunk/online-update/yast2-online-update.spec.in Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=38273&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Tue Jun 5 09:04:44 2007 @@ -1 +1 @@ -2.15.14 +2.15.15 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Tue Jun 5 09:04:44 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 13:39:38 CEST 2007 - jsuchome(a)suse.cz + +- use zypper intseatd of rug for automatic online update (#273133) +- 2.15.15 + +------------------------------------------------------------------- Fri May 25 16:12:47 CEST 2007 - jsuchome(a)suse.cz - DonePackage and DoneProvide callbacks return "I" (#277351) Modified: trunk/online-update/src/AutoOnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/AutoOnlineUpda… ============================================================================== --- trunk/online-update/src/AutoOnlineUpdate.ycp (original) +++ trunk/online-update/src/AutoOnlineUpdate.ycp Tue Jun 5 09:04:44 2007 @@ -81,7 +81,7 @@ global boolean modified = false; // the application that does the update (rug/zypper) -global string updater = "rug"; +global string updater = "zypper"; // packages required for installation (for autoYaST) list required_packages = []; @@ -237,7 +237,7 @@ if (Package::Installed ("zypper")) updater = "zypper"; else if (Package::Installed ("zmd")) - // rug is default if zmd is present + // rug is default only if zmd is present to_install = "rug"; else to_install = "zypper"; Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-updat… ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Tue Jun 5 09:04:44 2007 @@ -47,6 +47,10 @@ fi fi rm -f /etc/cron.d/yast2-online-update.bak + # now we have zypper instead of rug (bug #273133) + if [ "`grep -c rug /etc/cron.d/yast2-online-update 2>/dev/null`" -gt 0 ]; then + sed -e "s/rug/zypper/g" -i /etc/cron.d/yast2-online-update + fi fi to_remove="/usr/share/YaST2/clients/product_post.ycp" if [ -f $to_remove ] ; then -- 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] r38272 - in /trunk/kdump/src: Kdump.ycp dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: juhliarik Date: Mon Jun 4 17:07:43 2007 New Revision: 38272 URL: http://svn.opensuse.org/viewcvs/yast?rev=38272&view=rev Log: added functions for handling setting for memory Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=38272&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Mon Jun 4 17:07:43 2007 @@ -76,6 +76,14 @@ global list <string> uknown_fs_partitions =[]; /** + * Total available memory + * + * + * integer + */ +global integer total_memory =0; + +/** * Boolean option indicates kernel parameter * "crashkernel" * @@ -232,7 +240,36 @@ return true; } +/** + * Read available memory + * + * read kernel parameter "crashkernel" + * @return boolean successfull + */ +boolean ReadAvailableMemory () { + list <map> output = (list<map>)SCR::Read(.probe.memory); + y2milestone("[kdump] (ReadAvailableMemory) SCR::Read(.probe.memory): %1", output); + + map <any,any> resor = $[]; + list <any> temp = maplist(map mem, output,{ + return mem["resource"]:nil; + }); + //y2milestone("[kdump] (ReadAvailableMemory) temp: %1", temp); + resor = tomap(temp[0]:nil); + + output = (list<map>)resor["phys_mem"]:nil; + temp = maplist(map mem, output,{ + return mem["range"]:nil; + }); + //list <any> range = maplist(map resor["phys_mem"]:nil); + + //resor = (map)range; + total_memory = tointeger(temp[0]:nil)/1048576; + y2milestone("[kdump] (ReadAvailableMemory) total phys. memory [MB]: %1", tostring(total_memory)); + + return true; +} /** * Read current kdump configuration * @@ -262,22 +299,27 @@ /* Kdump read dialog caption */ string caption = _("Initializing kdump Configuration"); - integer steps = 3; + integer steps = 4; sleep(sl); Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ + /* Progress stage 1/4 */ _("Read the config file"), - /* Progress stage 2/3 */ + /* Progress stage 2/4 */ _("Read disk partitions"), - /* Progress stage 3/3 */ + /* Progress stage 3/4 */ _("Read kernel boot options"), + /* Progress stage 4/4 */ + _("Read available memory"), + ], [ - /* Progress step 1/3 */ + /* Progress step 1/4 */ _("Reading the config file..."), - /* Progress step 2/3*/ + /* Progress step 2/4*/ _("Reading partitions of disks..."), - /* Progress finished 3/3*/ + /* Progress finished 3/4*/ + _("Reading available memory..."), + /* Progress finished 4/4*/ Message::Finished() ], "" @@ -305,6 +347,12 @@ if(!ReadKdumpKernelParam ()) Report::Error(_("Cannot read kernel boot options")); //sleep(sl); + // read another database + if(Abort()) return false; + Progress::NextStep(); + /* Error message */ + if(!ReadAvailableMemory ()) Report::Error(_("Cannot read available memory")); + //sleep(sl); if(Abort()) return false; /* Progress finished */ Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38272&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Mon Jun 4 17:07:43 2007 @@ -225,18 +225,18 @@ "custom_widget" : `HSquash(`VBox( `Left(`HBox( `Left(`Label("Total System Memory [MB]:")), - `Left(`Label(`id("total_memory"),"4096")), + `Left(`Label(`id("total_memory"),"0123456789")), `HStretch () )), `Left(`HBox( `Left(`Label("Usable Memory [MB]:")), - `Left(`Label(`id("usable_memory"),"3968")), + `Left(`Label(`id("usable_memory"),"0123456789")), `HStretch () )), - `Left(`IntField(`id("memory_buffer"), _("Kdump Memor&y [MB]"),128,4096,128)) + `Left(`IntField(`id("memory_buffer"), `opt(`notify), _("Kdump Memor&y [MB]"),128,4096,128)) )), - //"init" : - //"handle" : + "init" : InitKdumpMemory, + "handle" : HandleKdumpMemory, //"store" : "help" : HelpKdump("KdumpMemory"), ], Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Mon Jun 4 17:07:43 2007 @@ -165,7 +165,8 @@ */ symbol HandleTargetKdump (string key, map event) { - any radiobutton = UI::QueryWidget(`id("DumpTarget"), `CurrentButton); + + any radiobutton = event["ID"]:nil; if (radiobutton == "local_filesystem") { UI::ReplaceWidget (`id ("Network"), `Empty()); @@ -177,17 +178,17 @@ if (!set_network) UI::ReplaceWidget (`id ("Network"), network); set_network = true; - any net = UI::QueryWidget(`id("NetworkRB"), `CurrentButton); - if (net == "ftp") { - UI::ReplaceWidget (`id ("Targets"), ftp); - } else if (net == "ssh") { - UI::ReplaceWidget (`id ("Targets"), ssh); - } else if (net == "nfs") { - UI::ReplaceWidget (`id ("Targets"), nfs); - } else if (net == "smb") { - UI::ReplaceWidget (`id ("Targets"), smb); - } + //any net = UI::QueryWidget(`id("NetworkRB"), `CurrentButton); + } else if (radiobutton == "ftp") { + UI::ReplaceWidget (`id ("Targets"), ftp); + } else if (radiobutton == "ssh") { + UI::ReplaceWidget (`id ("Targets"), ssh); + } else if (radiobutton == "nfs") { + UI::ReplaceWidget (`id ("Targets"), nfs); + } else if (radiobutton == "smb") { + UI::ReplaceWidget (`id ("Targets"), smb); } + return nil; } @@ -468,17 +469,44 @@ } +/** + * Function initializes option + * "KdumpMemory" + */ +void InitKdumpMemory (string key) { + if (Kdump::total_memory > 0) { + UI::ChangeWidget(`id("total_memory"), `Value, tostring(Kdump::total_memory)); + UI::ChangeWidget(`id("memory_buffer"), `Value, 128); + UI::ChangeWidget(`id("usable_memory"), `Value, + tostring((Kdump::total_memory - (integer) UI::QueryWidget(`id("memory_buffer"), `Value)))); + } else { + UI::ChangeWidget(`id("total_memory"), `Value, "0"); + UI::ChangeWidget(`id("usable_memory"), `Value, "0"); + UI::ChangeWidget(`id("memory_buffer"), `Enabled, false); + } +} +/** + * Hadle function for option + * "Dump Level" + */ +symbol HandleKdumpMemory (string key, map event) { + any ret = event["ID"]:nil; + if (ret == "memory_buffer") { + integer value = (integer) UI::QueryWidget(`id("memory_buffer"), `Value); + if (value > Kdump::total_memory) { + UI::ChangeWidget(`id("memory_buffer"), `Value, Kdump::total_memory); + UI::ChangeWidget(`id("usable_memory"), `Value, "0"); + } else { + UI::ChangeWidget(`id("usable_memory"), `Value, + tostring((Kdump::total_memory - (integer) UI::QueryWidget(`id("memory_buffer"), `Value)))); + } + } - - - - - - +} } \ 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] r38271 - in /trunk/core/agents-perl/testsuite: Makefile.am t-double-status.exp t-echo-sleep.exp t-echo.exp t-norun.exp t-srcmgr1.exp t-srcmgr2.exp test-common.exp
by mvidner＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: mvidner Date: Mon Jun 4 16:27:08 2007 New Revision: 38271 URL: http://svn.opensuse.org/viewcvs/yast?rev=38271&view=rev Log: Factored out common setup. Distribute the stuff too. Added: trunk/core/agents-perl/testsuite/test-common.exp Modified: trunk/core/agents-perl/testsuite/Makefile.am trunk/core/agents-perl/testsuite/t-double-status.exp trunk/core/agents-perl/testsuite/t-echo-sleep.exp trunk/core/agents-perl/testsuite/t-echo.exp trunk/core/agents-perl/testsuite/t-norun.exp trunk/core/agents-perl/testsuite/t-srcmgr1.exp trunk/core/agents-perl/testsuite/t-srcmgr2.exp Modified: trunk/core/agents-perl/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/Makef… ============================================================================== --- trunk/core/agents-perl/testsuite/Makefile.am (original) +++ trunk/core/agents-perl/testsuite/Makefile.am Mon Jun 4 16:27:08 2007 @@ -7,3 +7,5 @@ t-srcmgr2.exp XFAIL_TESTS = t-srcmgr1.exp + +EXTRA_DIST = test-comon.exp $(TESTS) Modified: trunk/core/agents-perl/testsuite/t-double-status.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-dou… ============================================================================== --- trunk/core/agents-perl/testsuite/t-double-status.exp (original) +++ trunk/core/agents-perl/testsuite/t-double-status.exp Mon Jun 4 16:27:08 2007 @@ -1,35 +1,8 @@ #!/usr/bin/expect -- -# test ... +# try to test bug #263308 -set timeout 3 -expect_after { - default { - puts "OOPS, last matched <<$expect_out(buffer)>>" - exit 1 - } - # pass thru agent stderr -# -i $error_spawn_id -# default {send_user $expect_out(buffer)} -} - -#stty -echo - -#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" -set prog "../ag_background" -puts $prog - -# does not work -#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" - -# can pass -d -spawn $prog $argv - -match_max 100000 - -# TODO use a basic loop like in example and docs -# (while running, or while output open? clarify!) +source test-common.exp -# sleep: have it still running while this simple test runs send "`Execute(.run_output_err, \"echo O; echo O; sleep 1; echo OUT; echo >&2 ERR; exit 2\")\r" expect "(true)$" Modified: trunk/core/agents-perl/testsuite/t-echo-sleep.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-ech… ============================================================================== --- trunk/core/agents-perl/testsuite/t-echo-sleep.exp (original) +++ trunk/core/agents-perl/testsuite/t-echo-sleep.exp Mon Jun 4 16:27:08 2007 @@ -1,20 +1,7 @@ -#!/usr/bin/expect -f -# test agent status before starting a process -set timeout 3 -expect_after { - default { - puts OOPS - exit 1 - } -} +#!/usr/bin/expect -- +# echo something and sleep -#stty -echo -spawn ../ag_background -match_max 100000 -expect -exact "" - -# TODO use a basic looplike in example and docs -# (while running, or while output open? clarify!) +source test-common.exp # sleep: have it still running while this simple test runs send "`Execute(.run, \"echo Hello world; sleep 2\")\r" Modified: trunk/core/agents-perl/testsuite/t-echo.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-ech… ============================================================================== --- trunk/core/agents-perl/testsuite/t-echo.exp (original) +++ trunk/core/agents-perl/testsuite/t-echo.exp Mon Jun 4 16:27:08 2007 @@ -1,16 +1,8 @@ -#!/usr/bin/expect -f -# test agent status before starting a process -set timeout 3 -expect_after { - default { - puts OOPS - exit 1 - } -} +#!/usr/bin/expect -- +# sleep, then echo something. simlple test without a loop. + +source test-common.exp -#stty -echo -spawn ../ag_background -match_max 100000 expect -exact "" # sleep: have it still running while this simple test runs Modified: trunk/core/agents-perl/testsuite/t-norun.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-nor… ============================================================================== --- trunk/core/agents-perl/testsuite/t-norun.exp (original) +++ trunk/core/agents-perl/testsuite/t-norun.exp Mon Jun 4 16:27:08 2007 @@ -1,16 +1,8 @@ -#!/usr/bin/expect -f +#!/usr/bin/expect -- # test agent status before starting a process -set timeout 3 -expect_after { - default { - puts OOPS - exit 1 - } -} -#stty -echo -spawn ../ag_background -match_max 100000 +source test-common.exp + expect -exact "" send "`Read(.pid)\r" Modified: trunk/core/agents-perl/testsuite/t-srcmgr1.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-src… ============================================================================== --- trunk/core/agents-perl/testsuite/t-srcmgr1.exp (original) +++ trunk/core/agents-perl/testsuite/t-srcmgr1.exp Mon Jun 4 16:27:08 2007 @@ -1,35 +1,9 @@ #!/usr/bin/expect -- -# test ... +# test bug #263308 +# the old agent only checks the exit status when closing a pipe, not on SIGCHLD -set timeout 3 -expect_after { - default { - puts "OOPS, last matched <<$expect_out(buffer)>>" - exit 1 - } - # pass thru agent stderr -# -i $error_spawn_id -# default {send_user $expect_out(buffer)} -} - -#stty -echo - -#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" -set prog "../ag_background" -#puts $prog - -# does not work -#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" - -# can pass -d -spawn $prog $argv - -match_max 100000 - -# TODO use a basic loop like in example and docs -# (while running, or while output open? clarify!) +source test-common.exp -# sleep: have it still running while this simple test runs #send "`Execute(.run_output_err, \"echo O; echo O; exec 1<&-; sleep 2; echo >&2 ERR; exit 113\")\r" send "`Execute(.run_output_err, \"echo OUT; echo OUT; echo >&2 ERR; exec 1<&- 2<&-; sleep 2; exit 113\")\r" expect "(true)$" Modified: trunk/core/agents-perl/testsuite/t-srcmgr2.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/t-src… ============================================================================== --- trunk/core/agents-perl/testsuite/t-srcmgr2.exp (original) +++ trunk/core/agents-perl/testsuite/t-srcmgr2.exp Mon Jun 4 16:27:08 2007 @@ -1,36 +1,14 @@ #!/usr/bin/expect -- # test ... -set timeout 3 -expect_after { - default { - puts "OOPS, last matched <<$expect_out(buffer)>>" - exit 1 - } - # pass thru agent stderr -# -i $error_spawn_id -# default {send_user $expect_out(buffer)} -} - -#stty -echo - -#set prog "/usr/lib/YaST2/servers_non_y2/ag_background" -set prog "../ag_background" -#puts $prog - -# does not work -#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" - -# can pass -d -spawn $prog $argv - -match_max 100000 +source test-common.exp - -send "`Execute(.run_output_err, \"seq 100 199; seq 200 249 >&2; exec 1<&- 2<&-; sleep 2; exit 113\")\r" +send "`Write(.buffer_size, 10)\r"; +expect "(true)$" +send "`Write(.buffer_size_err, 10)\r"; expect "(true)$" -send "`Write(.buffer_size, 10)\r"; +send "`Execute(.run_output_err, \"seq 100 199; seq 200 249 >&2; exec 1<&- 2<&-; sleep 2; exit 113\")\r" expect "(true)$" while {1} { Added: trunk/core/agents-perl/testsuite/test-common.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/testsuite/test-… ============================================================================== --- trunk/core/agents-perl/testsuite/test-common.exp (added) +++ trunk/core/agents-perl/testsuite/test-common.exp Mon Jun 4 16:27:08 2007 @@ -0,0 +1,32 @@ +# common setup for test cases of ag_backgound + +# enlarge your input buffer now! satisfaction guaranteed! give us your $$$ +match_max 100000 + +set timeout 3 +expect_after { + default { + puts "OOPS" + puts "last matched <<$expect_out(buffer)>>" + exit 1 + } + # pass thru agent stderr +# -i $error_spawn_id +# default {send_user $expect_out(buffer)} +} + +#stty -echo + +set prog "../ag_background" + +# does not work +#spawn "sh" "-c" "PERLDB_OPTS='NonStop=1 AutoTrace=1 frame=6' perl -dS $prog" + +if {[lindex $argv 0] == "-u"} { + # -u: use the old one in /usr + set prog "/usr/lib/YaST2/servers_non_y2/ag_background" + set argv [lrange $argv 1 end]; # shift +} +# can pass -d +spawn $prog $argv + -- 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] r38270 - /tags/stable-2_15_9/ldap-client/
by jsuchome＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: jsuchome Date: Mon Jun 4 15:49:01 2007 New Revision: 38270 URL: http://svn.opensuse.org/viewcvs/yast?rev=38270&view=rev Log: Created tag stable-2_15_9 for ldap-client Added: tags/stable-2_15_9/ldap-client/ - copied from r38269, trunk/ldap-client/ -- 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] r38269 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: jsuchome Date: Mon Jun 4 15:48:15 2007 New Revision: 38269 URL: http://svn.opensuse.org/viewcvs/yast?rev=38269&view=rev Log: - call LDAPInitWithTLSCheck at one more place (#246397) - 2.15.9 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=38269&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Mon Jun 4 15:48:15 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Mon Jun 4 15:48:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 4 15:44:16 CEST 2007 - jsuchome(a)suse.cz + +- call LDAPInitWithTLSCheck at one more place (#246397) +- 2.15.9 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=38269… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Mon Jun 4 15:48:15 2007 @@ -1095,7 +1095,7 @@ if (!Ldap::bound || Ldap::old_server != Ldap::server || Ldap::DomainChanged ()) { - msg = Ldap::LDAPInit (); + msg = Ldap::LDAPInitWithTLSCheck ($[]); if (msg != "") { Ldap::LDAPErrorMessage ("init", msg); -- 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] r38268 - in /trunk/network/src: installation/inst_netprobe.ycp modules/Lan.ycp
by mzugec＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: mzugec Date: Mon Jun 4 15:32:04 2007 New Revision: 38268 URL: http://svn.opensuse.org/viewcvs/yast?rev=38268&view=rev Log: fix for build Modified: trunk/network/src/installation/inst_netprobe.ycp trunk/network/src/modules/Lan.ycp Modified: trunk/network/src/installation/inst_netprobe.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ne… ============================================================================== --- trunk/network/src/installation/inst_netprobe.ycp (original) +++ trunk/network/src/installation/inst_netprobe.ycp Mon Jun 4 15:32:04 2007 @@ -11,13 +11,13 @@ textdomain "network"; -import "Detection"; +import "NetHwDetection"; y2milestone("----------------------------------------"); y2milestone("Lan netprobe module started"); y2milestone("Args: %1", WFM::Args()); -if(!Detection::running) Detection::Start(); +if(!NetHwDetection::running) NetHwDetection::Start(); y2milestone("Lan netprobe module finished"); y2milestone("----------------------------------------"); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Jun 4 15:32:04 2007 @@ -1868,7 +1868,7 @@ { y2milestone ("hostname from dns"); // try to get hostname from the network - string hnent = Detection::ResolveIP(ipaddr); + string hnent = NetHwDetection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) if (hnent == "") -- 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] r38267 - /tags/stable-2_15_5/tv/
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: lslezak Date: Mon Jun 4 15:11:49 2007 New Revision: 38267 URL: http://svn.opensuse.org/viewcvs/yast?rev=38267&view=rev Log: Created tag stable-2_15_5 for tv Added: tags/stable-2_15_5/tv/ - copied from r38266, 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] r38266 - in /trunk/tv: ./ VERSION package/yast2-tv.changes src/ src/Tv.ycp
by lslezak＠svn.opensuse.org 04 Jun '07

04 Jun '07

Author: lslezak Date: Mon Jun 4 15:11:05 2007 New Revision: 38266 URL: http://svn.opensuse.org/viewcvs/yast?rev=38266&view=rev Log: - respect "fw_install" flag in DVB card DB (do not install the firmware if the card doesn't need it) - 2.15.5 Modified: trunk/tv/ (props changed) trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/ (props changed) trunk/tv/src/Tv.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=38266&r1=38265&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Mon Jun 4 15:11:05 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 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 Mon Jun 4 15:11:05 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jun 4 14:35:57 CEST 2007 - lslezak(a)suse.cz + +- tv card DB updated to kernel-default-2.6.21-12 +- respect "fw_install" flag in DVB card DB (do not install the + firmware if the card doesn't need it) +- 2.15.5 + +------------------------------------------------------------------- Mon Jun 4 10:51:02 CEST 2007 - lslezak(a)suse.cz - check whether lirc service and /etc/sysconfig/lirc are available Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=38266&r1=38265… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Mon Jun 4 15:11:05 2007 @@ -1254,9 +1254,17 @@ // find card that requires the driver string cardname = "TV"; + // is the firmware really needed? + boolean firmware_needed = false; + foreach(map card, (list<map>) cards, { list<string> drvs = card["module"]:[]; + if (card["fw_install"]:true) + { + firmware_needed = true; + } + if (contains(drvs, drv)) { cardname = card["name"]:"TV"; @@ -1264,6 +1272,11 @@ } ); + if (firmware_needed) + { + y2milestone("Skipping firmware installation for driver '%1' (card '%2')", drv, cardname); + continue; + } list<map<string,any> > fws = (list<map<string,any> >)firmware_database[drv]:[]; @@ -1470,6 +1483,7 @@ list<map> detected = (list<map>)SCR::Read(.probe.tv); list<map> probe_dvb = (list<map>)SCR::Read(.probe.dvb); + if (probe_dvb != nil) { detected = (list<map>)merge(detected, probe_dvb); @@ -1925,6 +1939,7 @@ } list probe_tv = (list) SCR::Read(.probe.tv); + y2milestone(".probe.tv: %1", probe_tv); if (probe_tv == nil) { // Warning message popup (detection problem): @@ -1936,6 +1951,7 @@ // probe for DVB cards list<map> probe_dvb = (list<map>) SCR::Read(.probe.dvb); + y2milestone(".probe.dvb: %1", probe_dvb); if (probe_dvb == nil) { @@ -2417,6 +2433,8 @@ } ); + y2milestone("cards: %1", cards); + list<map<string,any> > conf_list = maplist (map card, (list<map<string,any> >) cards, ``{ map<string,any> ret = $[]; boolean isdvb = card["dvb"]:false; @@ -2456,22 +2474,29 @@ { if (firmware_database != nil && size(firmware_database) > 0) { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + if (card["fw_install"]:nil == false) + { + y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); + } + else + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; - boolean inst = IsFWInstalled(firmware_prefix + target); + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + boolean inst = IsFWInstalled(firmware_prefix + target); - descr = add(descr, _("Firmware: ") + - ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); - } - ); + descr = add(descr, _("Firmware: ") + + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); + } + ); + } } - } - ); + ); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0