- YaST Commits

[yast-commit] r38090 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp src/complex.ycp
by lslezak＠svn.opensuse.org 22 May '07

22 May '07

Author: lslezak Date: Tue May 22 16:51:52 2007 New Revision: 38090 URL: http://svn.opensuse.org/viewcvs/yast?rev=38090&view=rev Log: - run the package selector when there is an unresolved dependency when creating installation ISO Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp branches/tmp/lslezak/cd-creator/src/complex.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Tue May 22 16:51:52 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 16:49:28 CEST 2007 - lslezak(a)suse.cz + +- run the package selector when there is an unresolved dependency + when creating installation ISO + +------------------------------------------------------------------- Tue May 22 14:05:39 CEST 2007 - lslezak(a)suse.cz - escape XML entities in URL when writing the config file Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Tue May 22 16:51:52 2007 @@ -1970,7 +1970,7 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); - y2milestone("Selected %1 packages", size(selectedPackages)); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; Modified: branches/tmp/lslezak/cd-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/co… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/complex.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/complex.ycp Tue May 22 16:51:52 2007 @@ -24,7 +24,7 @@ import "CommandLine"; include "product-creator/helps.ycp"; - //include "product-creator/routines.ycp"; + include "product-creator/dialogs.ycp"; /** * Return a modification status @@ -464,6 +464,15 @@ CommandLine::PrintVerbose(_("Selecting packages...")); success = ProductCreator::setPackages(); + if (!success) + { + // set a fake root mount point - there is no use to display DU of the current system + Pkg::TargetInitDU([ $[ "name" : "/", "free" : 999*1024*1024 /* 999GB */, "used" : 0, "readonly" : false ] ]); + + // the solver has failed, let the user resolve the dependencies + detailedSelection(nil); + } + Progress::NextStage(); CommandLine::PrintVerbose(_("Checking packages...")); -- 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] r38089 - /trunk/autoinstallation/src/dialogs/general_dialogs.ycp
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 16:29:37 2007 New Revision: 38089 URL: http://svn.opensuse.org/viewcvs/yast?rev=38089&view=rev Log: ask-UI enhancements Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/gen… ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Tue May 22 16:29:37 2007 @@ -155,8 +155,8 @@ ) ), `HBox( - `TextEntry( `id(`selLabel), "Label", "" ), - `TextEntry( `id(`selValue), _("Value"), "" ), + `TextEntry( `id(`selLabel), `opt(`notify,`immediate), "Label", "" ), + `TextEntry( `id(`selValue), `opt(`notify,`immediate), _("Value"), "" ), `PushButton( `id( `addSelection ), `opt( `default, `hstretch ), _("Add") ) ), `HBox( @@ -168,6 +168,17 @@ string help_text = _("<P></P>"); UI::OpenDialog( `opt(`decorated ), contents ); repeat { + if( size( (list)UI::QueryWidget(`id(`selection), `Items) ) == 0 ) { + UI::ChangeWidget(`id(`delSelection) , `Enabled, false); + } else { + UI::ChangeWidget(`id(`delSelection) , `Enabled, true); + } + if( size( (string)UI::QueryWidget(`id(`selLabel), `Value) ) == 0 || + size( (string)UI::QueryWidget(`id(`selValue), `Value) ) == 0 ) { + UI::ChangeWidget(`id(`addSelection) , `Enabled, false); + } else { + UI::ChangeWidget(`id(`addSelection) , `Enabled, true); + } ret = (symbol)UI::UserInput(); if( ret == `addSelection ) { string label = (string)UI::QueryWidget(`id(`selLabel), `Value); @@ -194,7 +205,8 @@ "title":title, "stage":stage, "dialog":dialog, - "element":defaultValues["element"]:max, + "element":defaultValues["element"]:max, + "script":defaultValues["script"]:"", "question":(string)UI::QueryWidget(`id(`question), `Value) ]; if( (string)UI::QueryWidget(`id(`frametitle), `Value) != "" ) newVal["frametitle"] = (string)UI::QueryWidget(`id(`frametitle), `Value); -- 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] r38088 - /tags/branch-SLE-10-SP1-2_13_14/x11/
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:51:13 2007 New Revision: 38088 URL: http://svn.opensuse.org/viewcvs/yast?rev=38088&view=rev Log: Created tag branch-SLE-10-SP1-2_13_14 for x11 Added: tags/branch-SLE-10-SP1-2_13_14/x11/ - copied from r38087, branches/SuSE-SLE-10-SP1-Branch/x11/ -- 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] r38087 - in /branches/SuSE-SLE-10-SP1-Branch/x11: VERSION package/yast2-x11.changes src/XLib.pm
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:50:56 2007 New Revision: 38087 URL: http://svn.opensuse.org/viewcvs/yast?rev=38087&view=rev Log: - 2.13.14 - fixed x11 setup on Xen para-virtualized framebuffer (#267220) Modified: branches/SuSE-SLE-10-SP1-Branch/x11/VERSION branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm Modified: branches/SuSE-SLE-10-SP1-Branch/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/VE… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/VERSION Tue May 22 14:50:56 2007 @@ -1 +1 @@ -2.13.13 +2.13.14 Modified: branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/pa… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes Tue May 22 14:50:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de + +- 2.13.14 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) + +------------------------------------------------------------------- Wed May 9 12:13:22 CEST 2007 - ms(a)suse.de - v2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/sr… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm Tue May 22 14:50:56 2007 @@ -465,6 +465,9 @@ $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; + if (! @list) { + push (@list,"800x600"); + } my $result = shift (@list); return $result; } -- 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] r38086 - /trunk/network/src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:45:35 2007 New Revision: 38086 URL: http://svn.opensuse.org/viewcvs/yast?rev=38086&view=rev Log: again and better Modified: trunk/network/src/modules/Proxy.ycp Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Tue May 22 14:45:35 2007 @@ -231,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- 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] r38085 - /tags/stable-2_15_9/x11/
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:43:07 2007 New Revision: 38085 URL: http://svn.opensuse.org/viewcvs/yast?rev=38085&view=rev Log: Created tag stable-2_15_9 for x11 Added: tags/stable-2_15_9/x11/ - copied from r38084, trunk/x11/ -- 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] r38084 - in /trunk/x11: VERSION package/yast2-x11.changes src/XLib.pm
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:42:14 2007 New Revision: 38084 URL: http://svn.opensuse.org/viewcvs/yast?rev=38084&view=rev Log: - 2.15.9 - fixed x11 setup on Xen para-virtualized framebuffer (#267220) Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=38084&r1=38083&r… ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Tue May 22 14:42:14 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue May 22 14:42:14 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de + +- 2.15.9 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) + +------------------------------------------------------------------- Tue May 22 11:25:41 CEST 2007 - ms(a)suse.de - 2.15.8 Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=38084&r1=380… ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Tue May 22 14:42:14 2007 @@ -501,6 +501,9 @@ $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; + if (! @list) { + push (@list,"800x600"); + } my $result = shift (@list); return $result; } -- 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] r38083 - /tags/stable-2_15_33/network/
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:32:02 2007 New Revision: 38083 URL: http://svn.opensuse.org/viewcvs/yast?rev=38083&view=rev Log: Created tag stable-2_15_33 for network Added: tags/stable-2_15_33/network/ - copied from r38082, trunk/network/ -- 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] r38082 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:29:55 2007 New Revision: 38082 URL: http://svn.opensuse.org/viewcvs/yast?rev=38082&view=rev Log: - Escape backslash characters in proxy auth credentials properly (#256360) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38082&r1=380… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 22 14:29:55 2007 @@ -1 +1 @@ -2.15.32 +2.15.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 22 14:29:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 22 13:59:04 CEST 2007 - kmachalkova(a)suse.cz + +- Escape backslash characters in proxy auth credentials properly + (#256360) +- 2.15.33 + +------------------------------------------------------------------- Mon May 21 13:57:47 CEST 2007 - kmachalkova(a)suse.cz - IsHostLocal test extended to include also hostname and/or IP set by Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Tue May 22 14:29:55 2007 @@ -110,7 +110,7 @@ ]; string caption = _("Saving Proxy Configuration"); - integer sl = 100; //sleep for longer time, so that progress does not disappear right afterwards + integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards Progress::New(caption, " ", size(steps), steps, [], ""); @@ -215,11 +215,14 @@ https_proxy = mergestring (splitstring(https_proxy, "\""), "\\\""); ftp_proxy = mergestring (splitstring(ftp_proxy, "\""), "\\\""); proxy_user = mergestring (splitstring(proxy_user, "\""), "\\\""); + //escape also '\' character - usernames such as domain\user are causing pain to .target.bash_output + //and to curl - #256360 + proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + "'" + proxy_user + "'" + (proxy_password != "" ? - ":" + "'" + proxy_password + "'" + " --proxy-user " + proxy_user + (proxy_password != "" ? + ":" + proxy_password : "") : @@ -228,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy '%1' %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url '%4'"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- 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] r38081 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 22 May '07

22 May '07

Author: lslezak Date: Tue May 22 14:07:19 2007 New Revision: 38081 URL: http://svn.opensuse.org/viewcvs/yast?rev=38081&view=rev Log: - escape XML entities in URL when writing the config file (fixed saving of ISO file URL) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Tue May 22 14:07:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:05:39 CEST 2007 - lslezak(a)suse.cz + +- escape XML entities in URL when writing the config file + (fixed saving of ISO file URL) + +------------------------------------------------------------------- Mon May 21 16:58:32 CEST 2007 - lslezak(a)suse.cz - fixed the default boot item in isolinux.cfg for AutoYast Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Tue May 22 14:07:19 2007 @@ -377,6 +377,24 @@ global define list PrepareConfigs() ``{ list c = maplist(string k, map v, Configs, ``{ + + list<string> sources = v["sources"]:[]; + + // escape XML entities in URL + // (e.g. iso:///?iso=image.iso&url=file:///local/images/ cannot be stored by the XML agent) + if (size(sources) > 0) + { + sources = maplist(string src, sources, + { + return String::EscapeTags(src); + } + ); + + y2internal("Escaped sources: %1", sources); + + v["sources"] = sources; + } + return(v); }); return (c); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0