June 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64683 - in /trunk/registration: VERSION package/yast2-registration.changes yast2-registration.spec.in
by jdsn＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jdsn Date: Thu Jun 30 21:29:18 2011 New Revision: 64683 URL: http://svn.opensuse.org/viewcvs/yast?rev=64683&view=rev Log: fix broken xauth export file in post install script (bnc#702423) 2.21.1 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=64683&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Thu Jun 30 21:29:18 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 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 Thu Jun 30 21:29:18 2011 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Thu Jun 30 19:45:18 CEST 2011 - jdsn(a)suse.de +Thu Jun 30 21:25:18 CEST 2011 - jdsn(a)suse.de - cleanup xauth export after interactive registration (bnc#702638) +- fix broken xauth export file in post install script (bnc#702423) +- 2.21.1 ------------------------------------------------------------------- Tue Jun 28 19:11:55 CEST 2011 - jdsn(a)suse.de Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Thu Jun 30 21:29:18 2011 @@ -26,6 +26,7 @@ Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl Requires: yast2-pkg-bindings >= 2.17.20 Requires: yast2-registration-branding +Requires(post): sed grep ## do never require "mozilla-xulrunner190" (bnc#436900) PreReq: %fillup_prereq BuildRequires: yast2 >= 2.17.0 @@ -84,6 +85,14 @@ %post %{fillup_only -ns suse_register yast2-registration} +# fix broken xauth export from previous registration (bnc#702638) +export XAEXPORT=/root/.xauth/export +if [ -e "$XAEXPORT" ] && grep -q -v "^\s*$" "$XAEXPORT" +then + sed -i --follow-symlinks "/^suse-ncc$/d" "$XAEXPORT" + grep -q -v "^\s*$" "$XAEXPORT" || rm -f "$XAEXPORT" +fi + %files %defattr(-,root,root) -- 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] r64682 - in /branches/SuSE-Code-11-SP1-Branch/registration: VERSION package/yast2-registration.changes yast2-registration.spec.in
by jdsn＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jdsn Date: Thu Jun 30 21:29:00 2011 New Revision: 64682 URL: http://svn.opensuse.org/viewcvs/yast?rev=64682&view=rev Log: fix broken xauth export file in post install script (bnc#702423) 2.17.35.2 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Thu Jun 30 21:29:00 2011 @@ -1 +1 @@ -2.17.35.1 +2.17.35.2 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Thu Jun 30 21:29:00 2011 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Thu Jun 30 20:35:56 CEST 2011 - jdsn(a)suse.de +Thu Jun 30 21:21:56 CEST 2011 - jdsn(a)suse.de - cleanup xauth export after interactive registration (bnc#702638) +- fix broken xauth export file in post install script (bnc#702423) +- 2.17.35.2 ------------------------------------------------------------------- Fri Apr 8 16:22:22 CEST 2011 - jdsn(a)suse.de Modified: branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Thu Jun 30 21:29:00 2011 @@ -25,6 +25,7 @@ Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl Requires: yast2-pkg-bindings >= 2.17.20 Requires: yast2-registration-branding +Requires(post): sed grep ## do never require "mozilla-xulrunner190" (bnc#436900) PreReq: %fillup_prereq @@ -82,6 +83,13 @@ %post %{fillup_only -ns suse_register yast2-registration} %{fillup_only -ns automatic_online_update yast2-registration} +# fix broken xauth export from previous registration (bnc#702638) +export XAEXPORT=/root/.xauth/export +if [ -e "$XAEXPORT" ] && grep -q -v "^\s*$" "$XAEXPORT" +then + sed -i --follow-symlinks "/^suse-ncc$/d" "$XAEXPORT" + grep -q -v "^\s*$" "$XAEXPORT" || rm -f "$XAEXPORT" +fi %files -- 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] r64681 - in /branches/SuSE-Code-11-SP1-Branch/registration: package/yast2-registration.changes src/clients/inst_suse_register.ycp
by jdsn＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jdsn Date: Thu Jun 30 20:39:50 2011 New Revision: 64681 URL: http://svn.opensuse.org/viewcvs/yast?rev=64681&view=rev Log: cleanup xauth export after interactive registration (bnc#702638) Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Thu Jun 30 20:39:50 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 30 20:35:56 CEST 2011 - jdsn(a)suse.de + +- cleanup xauth export after interactive registration (bnc#702638) + +------------------------------------------------------------------- Fri Apr 8 16:22:22 CEST 2011 - jdsn(a)suse.de - fix proxy settings in automatic online update script, bnc#(678888) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Thu Jun 30 20:39:50 2011 @@ -450,6 +450,7 @@ string su_exec(string user, string group, string command) { // (#167255) + // introduce cleanup function to also cleanup the xauth entry (bnc#702638) string exec = sformat(" #!/bin/bash -x @@ -462,6 +463,8 @@ XA=/root/.xauth mkdir -p $XA +DELETEXAEXPORT=no +[ ! -e $XA/export ] && DELETEXAEXPORT=yes grep ^$user$ $XA/export >/dev/null 2>&1 || echo $user >> $XA/export mkdir -p $fakehome @@ -469,7 +472,22 @@ tmp=$(mktemp $fakehome/.Xauthority.XXXXXX) || exit 1 chmod 600 $tmp chown $user:$group $tmp $fakehome -trap \"rm -rf $fakehome\" EXIT INT HUP TERM + + +function cleanup +{ + if [ \"x$DELETEXAEXPORT\" = \"xyes\" ] + then + rm -f $XA/export + else + sed -i --follow-symlinks \"/^$user$/d\" $XA/export + fi + + rm -rf $fakehome +} + + +trap \"cleanup\" EXIT INT HUP TERM ", user, group, command ); -- 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] r64680 - in /trunk/registration: package/yast2-registration.changes src/clients/inst_suse_register.ycp
by jdsn＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jdsn Date: Thu Jun 30 20:39:42 2011 New Revision: 64680 URL: http://svn.opensuse.org/viewcvs/yast?rev=64680&view=rev Log: cleanup xauth export after interactive registration (bnc#702638) Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp 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 Thu Jun 30 20:39:42 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 30 19:45:18 CEST 2011 - jdsn(a)suse.de + +- cleanup xauth export after interactive registration (bnc#702638) + +------------------------------------------------------------------- Tue Jun 28 19:11:55 CEST 2011 - jdsn(a)suse.de - bump version 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 Thu Jun 30 20:39:42 2011 @@ -502,6 +502,7 @@ string su_exec(string user, string group, string command) { // (#167255) + // introduce cleanup function to also cleanup the xauth entry (bnc#702638) string exec = sformat(" #!/bin/bash -x @@ -514,6 +515,8 @@ XA=/root/.xauth mkdir -p $XA +DELETEXAEXPORT=no +[ ! -e $XA/export ] && DELETEXAEXPORT=yes grep ^$user$ $XA/export >/dev/null 2>&1 || echo $user >> $XA/export mkdir -p $fakehome @@ -521,7 +524,22 @@ tmp=$(mktemp $fakehome/.Xauthority.XXXXXX) || exit 1 chmod 600 $tmp chown $user:$group $tmp $fakehome -trap \"rm -rf $fakehome\" EXIT INT HUP TERM + + +function cleanup +{ + if [ \"x$DELETEXAEXPORT\" = \"xyes\" ] + then + rm -f $XA/export + else + sed -i --follow-symlinks \"/^$user$/d\" $XA/export + fi + + rm -rf $fakehome +} + + +trap \"cleanup\" EXIT INT HUP TERM ", user, group, command ); -- 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] r64679 - /tags/stable-2_21_0/instserver/
by lslezak＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: lslezak Date: Thu Jun 30 16:41:29 2011 New Revision: 64679 URL: http://svn.opensuse.org/viewcvs/yast?rev=64679&view=rev Log: Created tag stable-2_21_0 for instserver Added: tags/stable-2_21_0/instserver/ - copied from r64678, trunk/instserver/ -- 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] r64678 - /trunk/instserver/
by lslezak＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: lslezak Date: Thu Jun 30 16:41:17 2011 New Revision: 64678 URL: http://svn.opensuse.org/viewcvs/yast?rev=64678&view=rev Log: svn:ignore - ignore generated *.ami files Modified: trunk/instserver/ (props changed) -- 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] r64677 - in /trunk/instserver: VERSION package/yast2-instserver.changes src/dialogs.ycp
by lslezak＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: lslezak Date: Thu Jun 30 16:38:25 2011 New Revision: 64677 URL: http://svn.opensuse.org/viewcvs/yast?rev=64677&view=rev Log: - fixed a typo (bnc#703123) - 2.21.0 Modified: trunk/instserver/VERSION trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/dialogs.ycp Modified: trunk/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=64677&r1=… ============================================================================== --- trunk/instserver/VERSION (original) +++ trunk/instserver/VERSION Thu Jun 30 16:38:25 2011 @@ -1 +1 @@ -2.19.0 +2.21.0 Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instser… ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Thu Jun 30 16:38:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 14:35:48 UTC 2011 - lslezak(a)suse.cz + +- fixed a typo (bnc#703123) +- 2.21.0 + +------------------------------------------------------------------- Tue Jun 29 10:14:47 UTC 2010 - lslezak(a)suse.cz - fixed creating SLP reg. files: fixed reading supported Modified: trunk/instserver/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/dialogs.ycp?rev=6… ============================================================================== --- trunk/instserver/src/dialogs.ycp (original) +++ trunk/instserver/src/dialogs.ycp Thu Jun 30 16:38:25 2011 @@ -1159,7 +1159,7 @@ When adding a new repository with the same name the old content must deleted right now. -Really delete the old content and create it from cratch?"), dir); +Really delete the old content and create it from scratch?"), dir); if (Popup::YesNo(confirm)) { -- 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] r64676 - in /trunk/wagon: package/ src/clients/ src/include/
by lslezak＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: lslezak Date: Thu Jun 30 16:22:45 2011 New Revision: 64676 URL: http://svn.opensuse.org/viewcvs/yast?rev=64676&view=rev Log: - fixed typos (bnc#702648), fixed help text for migration repo selection dialog Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_dup_repositories.ycp trunk/wagon/src/clients/wagon_point_of_no_return.ycp trunk/wagon/src/clients/wagon_registration_check.ycp trunk/wagon/src/include/common_func.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Jun 30 16:22:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 14:13:52 UTC 2011 - lslezak(a)suse.cz + +- fixed typos (bnc#702648), fixed help text for migration repo + selection dialog + +------------------------------------------------------------------- Wed Jun 22 14:40:00 UTC 2011 - lslezak(a)suse.cz - added a new client for selecting DUP repositories (fate#311994) Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Thu Jun 30 16:22:45 2011 @@ -278,7 +278,7 @@ }); if (size (removed_packages) > 0) { - y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + y2milestone ("%1 products were removed, resetting packager", size (removed_packages)); ResetPackager(); foreach (string one_package, removed_packages, { Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repo… ============================================================================== --- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Thu Jun 30 16:22:45 2011 @@ -63,8 +63,8 @@ ); // help text - string help_text = "" + _("YaST checks whether the installed products are the installed products are registered.") - + "" + _("Migrating unregistered or partly registered system might result in broken system.") + ""; + string help_text = "" + _("Here select the repositories which will be used for migration.") + + "" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + ""; Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Modified: trunk/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_point_of… ============================================================================== --- trunk/wagon/src/clients/wagon_point_of_no_return.ycp (original) +++ trunk/wagon/src/clients/wagon_point_of_no_return.ycp Thu Jun 30 16:22:45 2011 @@ -36,7 +36,7 @@ Wagon::abort_can_revert_products = false; // @see BNC 575102 - y2milestone ("Reseting repos_already_registered flag"); + y2milestone ("Resetting repos_already_registered flag"); Wagon::repos_already_registered = false; return `auto; Modified: trunk/wagon/src/clients/wagon_registration_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registra… ============================================================================== --- trunk/wagon/src/clients/wagon_registration_check.ycp (original) +++ trunk/wagon/src/clients/wagon_registration_check.ycp Thu Jun 30 16:22:45 2011 @@ -186,7 +186,7 @@ ); // help text - string help_text = "" + _("YaST checks whether the installed products are the installed products are registered.") + string help_text = "" + _("YaST checks whether the installed products are registered.") + "" + _("Migrating unregistered or partly registered system might result in broken system.") + ""; Wizard::SetContents (heading_text, contents, help_text, Modified: trunk/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.yc… ============================================================================== --- trunk/wagon/src/include/common_func.ycp (original) +++ trunk/wagon/src/include/common_func.ycp Thu Jun 30 16:22:45 2011 @@ -119,13 +119,13 @@ void ResetPackager () { Wizard::SetContents ( - _("Reseting Package Manager"), - `Label(_("Reseting package manager...")), + _("Resetting Package Manager"), + `Label(_("Resetting package manager...")), "", false, true ); - y2milestone ("Reseting Pkg"); + y2milestone ("Resetting Pkg"); Pkg::PkgApplReset(); Pkg::PkgReset(); -- 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] r64675 - /tags/branch-Code-11-SP2-2_17_21/samba-client/
by jsuchome＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jsuchome Date: Thu Jun 30 15:57:44 2011 New Revision: 64675 URL: http://svn.opensuse.org/viewcvs/yast?rev=64675&view=rev Log: Created tag branch-Code-11-SP2-2_17_21 for samba-client Added: tags/branch-Code-11-SP2-2_17_21/samba-client/ (props changed) - copied from r64673, branches/SuSE-Code-11-SP2-Branch/samba-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] r64674 - /tags/branch-Code-11-SP2-2_17_28/ldap-client/
by jsuchome＠svn2.opensuse.org 30 Jun '11

30 Jun '11

Author: jsuchome Date: Thu Jun 30 15:57:42 2011 New Revision: 64674 URL: http://svn.opensuse.org/viewcvs/yast?rev=64674&view=rev Log: Created tag branch-Code-11-SP2-2_17_28 for ldap-client Added: tags/branch-Code-11-SP2-2_17_28/ldap-client/ (props changed) - copied from r64673, branches/SuSE-Code-11-SP2-Branch/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