From d2ccde6f38619deaaea41626f435d95cadf11495 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 23 Jan 2008 20:15:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=69 --- aaa_base.changes | 5 +++++ aaa_base.pre | 2 +- aaa_base.spec | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 8eac0a9..4eecdfa 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 23 21:13:35 CET 2008 - mrueckert@suse.de + +- only copy the secring if it really exists. + ------------------------------------------------------------------- Wed Jan 23 15:49:32 CET 2008 - ro@suse.de diff --git a/aaa_base.pre b/aaa_base.pre index 92468a3..d017a30 100644 --- a/aaa_base.pre +++ b/aaa_base.pre @@ -256,4 +256,4 @@ if test ! -f etc/defaultdomain -a -f /etc/rc.config ; then chmod 644 etc/defaultdomain fi -cp -a /root/.gnupg/secring.gpg /root/.gnupg/secring.gpg.aaa_save +test -e /root/.gnupg/secring.gpg && cp -a /root/.gnupg/secring.gpg /root/.gnupg/secring.gpg.aaa_save diff --git a/aaa_base.spec b/aaa_base.spec index bc38bd7..734ac9e 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -20,7 +20,7 @@ Recommends: logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools AutoReqProv: on Version: 11.0 -Release: 21 +Release: 22 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -141,6 +141,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %defattr(-,root,root) %changelog +* Wed Jan 23 2008 mrueckert@suse.de +- only copy the secring if it really exists. * Wed Jan 23 2008 ro@suse.de - don't overwite root/.gnupg/secring.gpg * Mon Jan 14 2008 aj@suse.de