diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-05-11 21:35:08 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-05-11 21:35:08 -0300 |
commit | 345b8c4070212e489cfc754155bc8dfea4db17b3 (patch) | |
tree | ad081c796dc4926227ce9b536266fe7c354b9d54 /pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch | |
parent | 5b032464a13505085ad85bcc646b5181c11c6bf1 (diff) | |
download | abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.tar.gz abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.tar.bz2 abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.zip |
mv aqsis,blender-addon-ogre,cambozola,cinepaint-lts,collada-dom,gimp-art,gimp-pcr,mednafen-server,mitsuba,nexuiz,nexuiz-data,noip,openssh-knock,python-pygame-hg,supermodel,systemd-knock,tupi,xcftools,yafaray,zoneminder to ssh://git@projects.parabola.nu/~git/pcr.git
Diffstat (limited to 'pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch')
-rw-r--r-- | pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch b/pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch deleted file mode 100644 index 6ea9c7cca..000000000 --- a/pcr/systemd-knock/0001-shared-install-avoid-prematurely-rejecting-missing-u.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0ffce503cd6e5a5ff5ba5cd1cc23684cfb8bb9e3 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 30 Oct 2014 20:12:05 -0400 -Subject: [PATCH] shared/install: avoid prematurely rejecting "missing" units - -f7101b7368df copied some logic to prevent enabling masked units, but -also added a check which causes attempts to enable templated units to -fail. Since we know the logic beyond this check will properly handle -units which truly do not exist, we can rely on the unit file state -comparison to suffice for expressing the intent of f7101b7368df. - -ref: https://bugs.archlinux.org/task/42616 ---- - src/shared/install.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/shared/install.c b/src/shared/install.c -index 035b44c..cab93e8 100644 ---- a/src/shared/install.c -+++ b/src/shared/install.c -@@ -1620,12 +1620,10 @@ int unit_file_enable( - STRV_FOREACH(i, files) { - UnitFileState state; - -+ /* We only want to know if this unit is masked, so we ignore -+ * errors from unit_file_get_state, deferring other checks. -+ * This allows templated units to be enabled on the fly. */ - state = unit_file_get_state(scope, root_dir, *i); -- if (state < 0) { -- log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); -- return state; -- } -- - if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { - log_error("Failed to enable unit: Unit %s is masked", *i); - return -ENOTSUP; --- -2.1.3 - |