Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
steam
systemd
Commits
4b90ab14
Commit
4b90ab14
authored
Nov 15, 2015
by
Michael Biebl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect handling of comma separator in systemd-delta
Closes: #793477
parent
3918ae33
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
debian/changelog
debian/changelog
+2
-0
debian/patches/delta-Fix-broken-separator-support.patch
debian/patches/delta-Fix-broken-separator-support.patch
+26
-0
debian/patches/series
debian/patches/series
+1
-0
No files found.
debian/changelog
View file @
4b90ab14
...
...
@@ -7,6 +7,8 @@ systemd (215-17+deb8u3) UNRELEASED; urgency=medium
every
daylight
saving
time
change
or
time
zone
change
by
travelling
will
make
the
time
jump
,
and
the
local
time
might
jump
backwards
which
creates
unsolvable
problems
with
file
timestamps
.
(
Closes
:
#
759319
)
*
Fix
incorrect
handling
of
comma
separator
in
systemd
-
delta
.
(
Closes
:
#
793477
)
--
Michael
Biebl
<
biebl
@
debian
.
org
>
Mon
,
16
Nov
2015
17
:
49
:
20
+
0100
...
...
debian/patches/delta-Fix-broken-separator-support.patch
0 → 100644
View file @
4b90ab14
From: Alison Chaiken <alison_chaiken@mentor.com>
Date: Sun, 30 Nov 2014 12:14:48 +0100
Subject: delta: Fix broken separator support
systemd-delta man page promises that multiple types of deltas will be
concatenated if they are listed with a comma as separator. Replace
FOREACH_WORD() with FOREACH_WORD_SEPARATOR() to restore the functionality.
(cherry-picked from commit d0a2e1c364320b862a6aae099afa106ea59bb84c)
---
src/delta/delta.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 96a9fa5..a9cb163 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -491,7 +491,7 @@
static int parse_flags(const char *flag_str, int flags) {
char *w, *state;
size_t l;
- FOREACH_WORD(w, l, flag_str, state) {
+ FOREACH_WORD_SEPARATOR(w, l, flag_str, ",", state) {
if (strneq("masked", w, l))
flags |= SHOW_MASKED;
else if (strneq ("equivalent", w, l))
debian/patches/series
View file @
4b90ab14
...
...
@@ -154,6 +154,7 @@ shared-add-path_compare-an-ordering-path-comparison.patch
core-namespace-fix-path-sorting.patch
cryptsetup-Fix-timeout-on-dm-device.patch
core-only-set-the-kernel-s-timezone-when-the-RTC-runs-in-.patch
delta-Fix-broken-separator-support.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment