September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40677 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 09:46:41 2007 New Revision: 40677 URL: http://svn.opensuse.org/viewcvs/yast?rev=40677&view=rev Log: - Added support for LiveCD installation into ProductLicense module (#299732). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.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 Sep 3 09:46:41 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 3 09:44:32 CEST 2007 - locilka(a)suse.cz + +- Added support for LiveCD installation into ProductLicense module + (#299732). + +------------------------------------------------------------------- Fri Aug 31 17:34:40 CEST 2007 - locilka(a)suse.cz - Added commandline support for inst_productsources (#304720). Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon Sep 3 09:46:41 2007 @@ -320,6 +320,31 @@ info_file = "/info.txt"; } +void SearchForLicense_LiveCDInstallation (integer src_id, string fallback_dir) { + y2milestone ("LiveCD License"); + + if (FileUtils::Exists ("/license.tar.gz")) { + tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir)); + string license_file = "/license.tar.gz"; + + if (UnpackLicenseTgzFileToDirectory (license_file, tmpdir)) { + license_dir = tmpdir; + license_file_print = "license.tar.gz"; + } else { + CleanUpLicense (tmpdir); + license_file = nil; + } + } else { + license_dir = nil; + } + + if (FileUtils::Exists ("/README.BETA")) { + info_file = "/README.BETA"; + } else { + info_file = nil; + } +} + void SearchForLicense_NormalRunBaseProduct (integer src_id, string fallback_dir) { y2milestone ("Using default license directory %1", fallback_dir); @@ -353,7 +378,7 @@ license_dir = tmpdir; license_file_print = "license.tar.gz"; } else { - license_file = nil; + license_dir = nil; } return; @@ -407,10 +432,16 @@ y2milestone ("Searching for licenses..."); license_file_print = nil; + // Bugzilla #299732 + // Base Product - LiveCD installation + if (Mode::live_installation()) { + + SearchForLicense_LiveCDInstallation (src_id, fallback_dir); + // Base-product - license not in installation // * Stage is not initial // * source ID is not defined - if (! Stage::initial() && src_id == nil) { + } else if (! Stage::initial() && src_id == nil) { SearchForLicense_NormalRunBaseProduct (src_id, fallback_dir); -- 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] r40676 - in /trunk/network: package/yast2-network.changes testsuite/tests/Proxy.out
by mzugec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mzugec Date: Mon Sep 3 09:30:46 2007 New Revision: 40676 URL: http://svn.opensuse.org/viewcvs/yast?rev=40676&view=rev Log: fixed Proxy testsuite Modified: trunk/network/package/yast2-network.changes trunk/network/testsuite/tests/Proxy.out 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 Mon Sep 3 09:30:46 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 3 09:37:00 CEST 2007 - mzugec(a)suse.cz + +- fixed Proxy testsuite + +------------------------------------------------------------------- Sat Sep 1 09:01:47 CEST 2007 - mzugec(a)suse.cz - read NISDomain instead of NisDomain from install.inf Modified: trunk/network/testsuite/tests/Proxy.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Proxy.ou… ============================================================================== --- trunk/network/testsuite/tests/Proxy.out (original) +++ trunk/network/testsuite/tests/Proxy.out Mon Sep 3 09:30:46 2007 @@ -6,9 +6,9 @@ Read .sysconfig.proxy.NO_PROXY nil Read .sysconfig.proxy.PROXY_ENABLED nil Read .target.size "/root/.curlrc" 1 -Read .root.curlrc.proxy-user "user:pass" +Read .root.curlrc."--proxy-user" nil Return true Dump Write Dump Import Dump Export -Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"pass", "proxy_user":"user"] +Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"", "proxy_user":""] -- 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] r40675 - /tags/stable-2_15_52/yast2/
by mvidner＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mvidner Date: Mon Sep 3 09:14:05 2007 New Revision: 40675 URL: http://svn.opensuse.org/viewcvs/yast?rev=40675&view=rev Log: Created tag stable-2_15_52 for yast2 Added: tags/stable-2_15_52/yast2/ - copied from r40674, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40674 - /trunk/yast2/scripts/yast2
by mvidner＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mvidner Date: Mon Sep 3 08:52:24 2007 New Revision: 40674 URL: http://svn.opensuse.org/viewcvs/yast?rev=40674&view=rev Log: Better diagnostics when the libraries are broken (#211392). Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=40674&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Mon Sep 3 08:52:24 2007 @@ -325,8 +325,9 @@ /usr/bin/test -x /bin/unicode_stop && /bin/unicode_stop fi else - echo "You need to install yast2-ncurses to use the YaST2 text mode interface" >&2 - exit 1 + rpm -V yast2-core yast2-ncurses yast2-qt yast2-gtk >&2 + echo "Something is wrong with the YaST user interface." >&2 + exit_code=1 fi # quick hack: treat gtk like qt elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; 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] r40673 - /trunk/mail/yast2-mail.spec.in
by varkoly＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: varkoly Date: Mon Sep 3 08:37:29 2007 New Revision: 40673 URL: http://svn.opensuse.org/viewcvs/yast?rev=40673&view=rev Log: Fixing bug 299606 – yast2 conflicts with yast2-mail due to yast2-mail-aliases Modified: trunk/mail/yast2-mail.spec.in Modified: trunk/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=4067… ============================================================================== --- trunk/mail/yast2-mail.spec.in (original) +++ trunk/mail/yast2-mail.spec.in Mon Sep 3 08:37:29 2007 @@ -22,8 +22,6 @@ Obsoletes: yast2-trans-mail Provides: yast2-mail-server Obsoletes: yast2-mail-server -Provides: yast2-mail-aliases -Obsoletes: yast2-mail-aliases Conflicts: aaa_base < 10.3 -- 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] r40672 - in /trunk/yast2: VERSION package/yast2.changes scripts/yast2
by mvidner＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mvidner Date: Mon Sep 3 08:24:47 2007 New Revision: 40672 URL: http://svn.opensuse.org/viewcvs/yast?rev=40672&view=rev Log: Use xmessage only if y2base fails. Don't use it for harmless warnings (#265263#c59). Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=40672&r1=40671… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Sep 3 08:24:47 2007 @@ -1 +1 @@ -2.15.51 +2.15.52 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 Sep 3 08:24:47 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 08:24:32 CEST 2007 - mvidner(a)suse.cz + +- Use xmessage only if y2base fails. Don't use it for harmless + warnings (#265263#c59). +- 2.15.52 + +------------------------------------------------------------------- Fri Aug 31 10:34:10 CEST 2007 - locilka(a)suse.cz - Fixing evaluation of unreadable cpuflags in Kernel.ycp (#303842). Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=40672&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Mon Sep 3 08:24:47 2007 @@ -17,27 +17,28 @@ # load common script functions . /usr/lib/YaST2/bin/yast2-funcs -# redirect to $@ if the input is not empty, #265263 -redir_nonempty() -{ - local IFS='' L - read L || return - exec &> >("$@") - echo "$L" - cat -} -# #211392 +# #211392, #265263 # if we are in X and do not have _input_ from terminal, -# make it output to xmessage +# save the output and display it via xmessage in case of error. +# TODO: also use bug-buddy or the kde thing... (#265263#c48) redirect() { if [ -n "$DISPLAY" -a ! -t 0 ]; then - XMESSAGE=`type -p xmessage` - if [ -n "$XMESSAGE" ]; then - exec &> >(redir_nonempty $XMESSAGE -buttons OK:0 -default OK -center -file -) - fi + ERRLOG=`mktemp -t yast2-err-XXXXXX` + trap exit_trap EXIT + exec &> $ERRLOG + fi +} + +exit_trap() +{ + # handily, exit_code is set to $? of y2base. + # If there was an error and there is anything to display, pop up. + if [ $exit_code != 0 -a -s $ERRLOG ]; then + xmessage -buttons OK:0 -default OK -center -file $ERRLOG fi + rm -f $ERRLOG } # redirect the output if necessary redirect -- 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] r40671 - /tags/stable-2_15_4/bluetooth/
by lslezak＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: lslezak Date: Mon Sep 3 08:15:28 2007 New Revision: 40671 URL: http://svn.opensuse.org/viewcvs/yast?rev=40671&view=rev Log: Created tag stable-2_15_4 for bluetooth Added: tags/stable-2_15_4/bluetooth/ - copied from r40670, trunk/bluetooth/ -- 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] r40670 - in /trunk/bluetooth: VERSION package/yast2-bluetooth.changes src/Bluetooth.ycp src/dialogs.ycp
by lslezak＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: lslezak Date: Mon Sep 3 08:15:15 2007 New Revision: 40670 URL: http://svn.opensuse.org/viewcvs/yast?rev=40670&view=rev Log: - fixed saving of empty PIN to the config file, allow alphanumeric chars in PIN if they are already present (#297804) - 2.15.4 Modified: trunk/bluetooth/VERSION trunk/bluetooth/package/yast2-bluetooth.changes trunk/bluetooth/src/Bluetooth.ycp trunk/bluetooth/src/dialogs.ycp Modified: trunk/bluetooth/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/VERSION?rev=40670&r1=4… ============================================================================== --- trunk/bluetooth/VERSION (original) +++ trunk/bluetooth/VERSION Mon Sep 3 08:15:15 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/bluetooth/package/yast2-bluetooth.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/package/yast2-bluetoot… ============================================================================== --- trunk/bluetooth/package/yast2-bluetooth.changes (original) +++ trunk/bluetooth/package/yast2-bluetooth.changes Mon Sep 3 08:15:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 08:11:57 CEST 2007 - lslezak(a)suse.cz + +- fixed saving of empty PIN to the config file, allow alphanumeric + chars in PIN if they are already present (#297804) +- 2.15.4 + +------------------------------------------------------------------- Fri Aug 24 13:07:18 CEST 2007 - lslezak(a)suse.cz - do not detect bluetooth devices when creating installation Modified: trunk/bluetooth/src/Bluetooth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/Bluetooth.ycp?rev=… ============================================================================== --- trunk/bluetooth/src/Bluetooth.ycp (original) +++ trunk/bluetooth/src/Bluetooth.ycp Mon Sep 3 08:15:15 2007 @@ -318,11 +318,11 @@ // save device name string device_name_save = device_name; - if (!regexpmatch(device_name_save, "^\"")) + if (!regexpmatch(device_name, "^\"")) { device_name_save = "\"" + device_name_save; } - if (!regexpmatch(device_name_save, "\"$")) + if (!regexpmatch(device_name, "\"$")) { device_name_save = device_name_save + "\""; } @@ -330,11 +330,11 @@ // the same for the PIN string pin_save = pin; - if (!regexpmatch(pin_save, "^\"")) + if (!regexpmatch(pin, "^\"")) { pin_save = "\"" + pin_save; } - if (!regexpmatch(pin_save, "\"$")) + if (!regexpmatch(pin, "\"$")) { pin_save = pin_save + "\""; } Modified: trunk/bluetooth/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/dialogs.ycp?rev=40… ============================================================================== --- trunk/bluetooth/src/dialogs.ycp (original) +++ trunk/bluetooth/src/dialogs.ycp Mon Sep 3 08:15:15 2007 @@ -116,8 +116,11 @@ Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton()); - // allow only numbers in PIN widget - UI::ChangeWidget(`id(`pin), `ValidChars, "0132456789"); + if (regexpmatch(Bluetooth::pin, "^[0-9]*$")) + { + // allow only numbers in PIN widget + UI::ChangeWidget(`id(`pin), `ValidChars, "0132456789"); + } RefreshGlobalWidgets(); RefreshPINWidgets(); -- 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] r40669 - /trunk/mail/yast2-mail.spec.in
by varkoly＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: varkoly Date: Mon Sep 3 08:01:06 2007 New Revision: 40669 URL: http://svn.opensuse.org/viewcvs/yast?rev=40669&view=rev Log: fix Proofreading Conflicts Modified: trunk/mail/yast2-mail.spec.in Modified: trunk/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=4066… ============================================================================== --- trunk/mail/yast2-mail.spec.in (original) +++ trunk/mail/yast2-mail.spec.in Mon Sep 3 08:01:06 2007 @@ -35,7 +35,7 @@ - %package plugins -Summary: Plugins for the yast2 users modul for enterprise mail server configuration. +Summary: Plugins for the YaST2 users modul for enterprise mail server configuration. Group: System/YaST Requires: perl-NetxAP -- 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] r40668 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp
by jdsn＠svn.opensuse.org 01 Sep '07

01 Sep '07

Author: jdsn Date: Sat Sep 1 09:12:20 2007 New Revision: 40668 URL: http://svn.opensuse.org/viewcvs/yast?rev=40668&view=rev Log: adapted source management changes (#304310) wrapping of detailled error messages (#239570) 2.15.2 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=40668&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Sat Sep 1 09:12:20 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Sat Sep 1 09:12:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Sep 1 08:34:49 CEST 2007 - jdsn(a)suse.de + +- adapted source management changes (#304310) +- wrapping of detailled error messages (#239570) +- 2.15.2 + +------------------------------------------------------------------- Tue Aug 21 21:42:33 CEST 2007 - jdsn(a)suse.de - handling sysconfig file with fillup (#300064) Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Sat Sep 1 09:12:20 2007 @@ -30,7 +30,6 @@ import "Internet"; import "Register"; import "SourceManager"; - import "PackageSystem"; import "Package"; // no network - no suse_register @@ -282,15 +281,26 @@ /* vv CCC ERROR POPUP vv */ term error_message_details= - `MinSize( 50, 15, `VBox( + `MinSize( 60, 20, `VBox( `Left( `Label( `opt(`boldFont), error_msg ) ), `VSpacing( 0.5 ), - `RichText(`id(`errordetail), `opt(`plainText) , "" ), + `RichText(`id(`errordetail), "" ), `PushButton(`id(`ok), Label::OKButton()) )); /* ^^ END CCC ERROR ^^ */ + /* vv CCC ERROR POPUP PLAINTEXT vv */ + term error_message_details_pt= + `MinSize( 50, 15, `VBox( + `Left( `Label( `opt(`boldFont), error_msg ) ), + `VSpacing( 0.5 ), + `RichText(`id(`errordetail), `opt(`plainText), "" ), + `PushButton(`id(`ok), Label::OKButton()) + )); + /* ^^ END CCC ERROR PLAINTEXT ^^ */ + + /* vv SUCCESS MESSAGE vv */ term nccc_success= @@ -339,8 +349,13 @@ if ( retry == `skip ) configure_status = false; else if (retry == `err_detail) { - UI::OpenDialog(error_message_details); - UI::ChangeWidget( `id(`errordetail), `Value, (string)information_data["stderr"]:"no error message available"); + // switch to plaintext if error output is one or two lines (#239570) + string error_msg_details = (string)information_data["stderr"]:"no error message available"; + if ( contains( [0,1], size(splitstring(error_msg_details,"\n")) ) ) + UI::OpenDialog(error_message_details); + else + UI::OpenDialog(error_message_details_pt); + UI::ChangeWidget( `id(`errordetail), `Value, error_msg_details); UI::UserInput(); UI::CloseDialog(); } @@ -467,8 +482,12 @@ } else { - // check for and install mozilla-xulrunner if needed (#175166) - Package::InstallAllMsg(["mozilla-xulrunner181"], nil); + // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310) + string required_package = "mozilla-xulrunner181"; + if (!Package::Installed(required_package)) + { + Package::InstallAllMsg([required_package], nil); + } cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; } @@ -543,11 +562,6 @@ /* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */ - // #172665, make sure that the added sources have a safe home - // It also takes care of target for keys, shows busy popup - // (#270899) should be taken care of even during installation - PackageSystem::EnsureSourceInit (); - // #170113, the lock is needed around everything that may end up in ZMD SourceManager::Lock (); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0