rpm/timezone
SHA256
1
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

Accepting request 202132 from Base:System

Browse Source 
- tzcode-link.diff: refresh patch to apply correctly on older
  versions of the distribution. (forwarded request 201982 from leonardocf)

OBS-URL: https://build.opensuse.org/request/show/202132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=79
This commit is contained in:
Tomáš Chvátal 2013-10-04 19:37:35 +00:00 committed by Git OBS Bridge
commit 8c44ff3e92
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timezone-java.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 2 23:35:00 UTC 2013 - lchiquitto@suse.com
- tzcode-link.diff: refresh patch to apply correctly on older
versions of the distribution.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org

6
timezone.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 2 23:35:00 UTC 2013 - lchiquitto@suse.com
- tzcode-link.diff: refresh patch to apply correctly on older
versions of the distribution.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org

16
tzcode-link.diff
View File

@ -1,8 +1,8 @@
Index: zic.c Index: timezone-2013g/zic.c
=================================================================== ===================================================================
--- zic.c.orig --- timezone-2013g.orig/zic.c
+++ zic.c +++ timezone-2013g/zic.c
@@ -576,6 +576,23 @@ _("%s: More than one -L option specified @@ -593,6 +593,23 @@ _("%s: More than one -L option specified
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
@ -26,12 +26,12 @@ Index: zic.c
static void static void
dolink(const char *const fromfield, const char *const tofield) dolink(const char *const fromfield, const char *const tofield)
{ {
@@ -609,6 +626,8 @@ dolink(const char *const fromfield, cons @@ -627,6 +644,8 @@ dolink(const char *const fromfield, cons
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
result = link(fromname, toname); result = link(fromname, toname);
+ if (result != 0) + if (result != 0)
+ result = copy(fromname, toname); + result = copy(fromname, toname);
#if HAVE_SYMLINK if (result != 0) {
if (result != 0 && const char *s = fromfield;
access(fromname, F_OK) == 0 && const char *t;