Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
steam
systemd
Commits
a9131c2c
Commit
a9131c2c
authored
Aug 20, 2014
by
Michael Biebl
Browse files
Cherry-pick upstream fix to ignore temporary dpkg files
Closes: #757302
parent
3de79dba
Changes
3
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
a9131c2c
...
...
@@ -20,6 +20,7 @@ systemd (208-8) UNRELEASED; urgency=medium
versions rely on kmod-static-nodes.service being provided by systemd.
(Closes: #757777)
* Updated upstream v208-stable patch series to 53b1b6c.
* Cherry-pick upstream fix to ignore temporary dpkg files. (Closes: #757302)
-- Martin Pitt <mpitt@debian.org> Thu, 07 Aug 2014 08:31:38 +0200
...
...
debian/patches/series
View file @
a9131c2c
...
...
@@ -524,6 +524,7 @@ analyze-fix-crash-on-invalid-commandline.patch
## Cherry-picked from trunk:
build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
login-revert-lazy-session-activation-on-non-VT-seats.patch
util-avoid-considering-dpkg-temporary-files-relevant.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
...
...
debian/patches/util-avoid-considering-dpkg-temporary-files-relevant.patch
0 → 100644
View file @
a9131c2c
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Aug 2014 15:32:09 +0200
Subject: util: avoid considering dpkg temporary files relevant for anything
https://bugs.freedesktop.org/show_bug.cgi?id=82453
(cherry picked from commit 0cdfd26ef826f8a595ab7d85ebc37894f4f3d940)
---
src/shared/util.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.c b/src/shared/util.c
index a634b9d..c0476e0 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1492,6 +1492,7 @@
_pure_ static bool ignore_file_allow_backup(const char *filename) {
endswith(filename, ".rpmorig") ||
endswith(filename, ".dpkg-old") ||
endswith(filename, ".dpkg-new") ||
+ endswith(filename, ".dpkg-tmp") ||
endswith(filename, ".swp");
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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