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&am... ============================================================================== --- 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-regist... ============================================================================== --- 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@suse.de +Thu Jun 30 21:25:18 CEST 2011 - jdsn@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@suse.de

Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.s... ============================================================================== --- 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)