diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-07-21 10:13:18 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-07-21 10:13:18 +0000 |
| commit | 287d4db96fcf4ab55a5665950080392313a35632 (patch) | |
| tree | 68ea331e91bf93428ae4666dc529515db42a2340 /eclass | |
| parent | Remove unnecessary nullglob option. (diff) | |
| download | emacs-287d4db96fcf4ab55a5665950080392313a35632.tar.gz emacs-287d4db96fcf4ab55a5665950080392313a35632.tar.bz2 emacs-287d4db96fcf4ab55a5665950080392313a35632.zip | |
The temporary file needs only be removed in the no changes case.
svn path=/emacs-overlay/; revision=1505
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 1 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e20f0ed..4ffbdad 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -3,6 +3,7 @@ * elisp-common.eclass (elisp-site-regen): The nullglob shell option is not needed here, because inside the loop we test for existence of all files anyway. See also bug 328863. + The temporary file needs only be removed in the no changes case. 2010-01-30 Ulrich Mueller <ulm@gentoo.org> diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index f127a14..6c7a99c 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -343,6 +343,7 @@ elisp-site-regen() { # This prevents outputting unnecessary text when there # was actually no change. # A case is a remerge where we have doubled output. + rm -f "${T}"/site-gentoo.el echo " no changes." else mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el @@ -354,8 +355,5 @@ elisp-site-regen() { esac fi - # cleanup - rm -f "${T}"/site-gentoo.el - return 0 } |