[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/systemd 5cb70eb 069/131: change dropin filename restrictio
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/systemd 5cb70eb 069/131: change dropin filename restrictions |
Date: |
Sun, 29 Aug 2021 11:35:16 -0400 (EDT) |
branch: elpa/systemd
commit 5cb70eb68420c6bda58a6c356aaeaf2942b31d0a
Author: Mark Oteiza <mvoteiza@udel.edu>
Commit: Mark Oteiza <mvoteiza@udel.edu>
change dropin filename restrictions
* do not match in .d/ subdirectories
* there are no restrictions on dropin config file base names
---
systemd.el | 3 +--
tests/systemd-tests.el | 7 ++++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/systemd.el b/systemd.el
index 42c9c9e..aa67670 100644
--- a/systemd.el
+++ b/systemd.el
@@ -220,8 +220,7 @@
;;;###autoload
(defconst systemd-dropin-autoload-regexp
(eval-when-compile
- (rx "/systemd/" (+? anything) ".d/"
- (+? (any "a-zA-Z0-9-_.@\\")) ".conf" string-end))
+ (rx "/systemd/" (+? anything) ".d/" (+? (not (any ?/))) ".conf"
string-end))
"Regexp for dropin config file buffers in which to autoload `systemd-mode'.")
(defun systemd-get-value (start)
diff --git a/tests/systemd-tests.el b/tests/systemd-tests.el
index 65089ab..8207eba 100644
--- a/tests/systemd-tests.el
+++ b/tests/systemd-tests.el
@@ -73,7 +73,12 @@ only if in an appropriately named parent directory."
(should (string-match-p re "/systemd/dog.socket.d/woof.conf"))
(should-not (string-match-p re "foobar.conf"))
(should-not (string-match-p re "/etc/modprobe.d/bonding.conf"))
- (should-not (string-match-p re "/etc/systemd/system.conf"))))
+ (should-not (string-match-p re "/etc/systemd/system.conf"))
+ ;; No restrictions on the base name
+ (should (string-match-p re ".config/systemd/user/foo.timer.d/კულტის.conf"))
+ (should (string-match-p re "/etc/systemd/user/c.service.d/a\nb.conf"))
+ ;; Do not match inside a subdirectory of foobar.d/
+ (should-not (string-match-p re
".config/systemd/user/foo.timer.d/a/b.conf"))))
(provide 'systemd-tests)
- [nongnu] elpa/systemd 22f024f 118/131: systemd 235, (continued)
- [nongnu] elpa/systemd 22f024f 118/131: systemd 235, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd c6e06df 123/131: happy new year, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 5b68986 024/131: add C-c C-d for opening systemd.directives(7), ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 09bfb67 030/131: explicitly require cl-lib, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 077b294 036/131: no change in systemd 220, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd f69d903 040/131: add missing network directives, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 1513dd0 054/131: systemd 228, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd dbf7830 057/131: happy new year, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd a434645 063/131: improvements to autoload regexen, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 4121a9a 064/131: section names can be prefixed with X-, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 5cb70eb 069/131: change dropin filename restrictions,
ELPA Syncer <=
- [nongnu] elpa/systemd 378eb36 077/131: nix some quotes. use some rx, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd a08af4c 080/131: systemd 230 directives, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 0e793b0 082/131: put the quotes back. faces are symbols, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 0a4b6c4 089/131: shrug, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd a2c60f4 096/131: happy belated new year, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 6884c8f 098/131: systemd 233?, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 995ebbe 106/131: add conventional environment variable highlighting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 3ff4f0f 108/131: anchor some matchers to follow "=", ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 70c7620 116/131: add -pkg file to clean target, ELPA Syncer, 2021/08/29
- [nongnu] elpa/systemd 21d50f2 121/131: Sort specifiers alphabetically, ELPA Syncer, 2021/08/29