Mercurial > hg > release > icedtea7-2.6
changeset 2893:937c6c005478
PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
2016-07-20 Andrew John Hughes <gnu.andrew@redhat.com>
PR3103: Handle case in clean-fonts where
linux.fontconfig.Gentoo.properties.old has
not been created
* Makefile.am:
(clean-fonts): Guard movement of old
Gentoo.properties.old file with a
check to see if it exists.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 29 Jul 2016 04:14:22 +0100 |
| parents | 2141e7831540 |
| children | c05a822a6ec0 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 29 04:11:18 2016 +0100 +++ b/ChangeLog Fri Jul 29 04:14:22 2016 +0100 @@ -1,3 +1,14 @@ +2016-07-20 Andrew John Hughes <gnu.andrew@redhat.com> + + PR3103: Handle case in clean-fonts where + linux.fontconfig.Gentoo.properties.old has + not been created + * Makefile.am: + (clean-fonts): Guard movement of old + Gentoo.properties.old file with a + check to see if it exists. + * NEWS: Updated. + 2016-07-20 Andrew John Hughes <gnu.andrew@redhat.com> PR3091: SystemTap is heavily confused
--- a/Makefile.am Fri Jul 29 04:11:18 2016 +0100 +++ b/Makefile.am Fri Jul 29 04:14:22 2016 +0100 @@ -1658,7 +1658,9 @@ clean-fonts: rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties - mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} + if [ -e $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old ] ; then \ + mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} ; \ + fi rm -f stamps/fonts.stamp stamps/patch-fsg.stamp: stamps/extract.stamp stamps/fonts.stamp
--- a/NEWS Fri Jul 29 04:11:18 2016 +0100 +++ b/NEWS Fri Jul 29 04:14:22 2016 +0100 @@ -98,6 +98,7 @@ - PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed - PR3091: SystemTap is heavily confused by multiple JDKs - PR3102: Extend 8022594 to AixPollPort + - PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created - PR3111: Provide option to disable SystemTap tests - PR3115: Add check for elliptic curve cryptography implementation * AArch64 port