From d4bca38fea72b0ceaab8d091e7de0c60b07572ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 30 Apr 2006 11:33:03 +0000 Subject: [PATCH] - also ignore rpmsave files Changed files: env-update.patch -> 1.5 env-update.spec -> 1.8 --- env-update.patch | 11 +++++++++++ env-update.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/env-update.patch b/env-update.patch index 6b74bd2..ebe33a4 100644 --- a/env-update.patch +++ b/env-update.patch @@ -90,3 +90,14 @@ # Get our environment variables SVCDIR = ENVIRON["SVCDIR"] +--- rc-scripts-1.6.14/src/awk/genenviron.awk~ 2006-04-30 14:29:39.116790228 +0300 ++++ rc-scripts-1.6.14/src/awk/genenviron.awk 2006-04-30 14:30:43.608236656 +0300 +@@ -29,7 +29,7 @@ + if (x in TMPENVFILES) { + + if ((isfile(TMPENVFILES[x])) && +- (TMPENVFILES[x] !~ /((\.(sh|c|bak))|\~)$/)) { ++ (TMPENVFILES[x] !~ /((\.(sh|c|bak|rpm(new|save|orig)))|\~)$/)) { + + ENVCOUNT++ + diff --git a/env-update.spec b/env-update.spec index 52d8366..6a21e4f 100644 --- a/env-update.spec +++ b/env-update.spec @@ -2,7 +2,7 @@ Summary: env-update - create /etc/profile.env from /etc/env.d files Summary(pl): env-update - tworzenie /etc/profile.env z plików /etc/env.d Name: env-update Version: 1.6.14 -Release: 0.5 +Release: 0.6 License: GPL v2 Group: Base Source0: http://distfiles.gentoo.org/distfiles/rc-scripts-%{version}.tar.bz2 -- 2.43.0