Changeset 1423 for trunk

Timestamp:

Oct 29, 2008, 12:44:46 AM (16 years ago)

Author:

price

Message:

use run-parts semantics in conf.d directory

Location:

trunk/packages/invirt-base

Files:

• debian/changelog (modified) (1 diff)
• python/invirt/config.py (modified) (2 diffs)

trunk/packages/invirt-base/debian/changelog

@@ -4 +4 @@
     invirt-getconf, so we can do what follows
   * look in /etc/invirt/conf.d/ as well as /etc/invirt/master.yaml
-
- -- Greg Price <price@mit.edu>  Tue, 28 Oct 2008 21:16:14 -0400
+  * use run-parts semantics in /etc/invirt/conf.d/
+
+ -- Greg Price <price@mit.edu>  Wed, 29 Oct 2008 00:10:36 -0400
 
 invirt-base (0.0.1) unstable; urgency=low

trunk/packages/invirt-base/python/invirt/config.py

@@ -8 +8 @@
 from contextlib import closing
 import yaml
+import re
 
 try:    loader = yaml.CSafeLoader
@@ -34 +35 @@
     return d1
 
+def run_parts_list(dirname):
+    """Reimplements Debian's run-parts --list.
+
+    One difference from run-parts's behavior: run-parts --list /foo/
+    will give output like /foo//bar, because Python code tends to expect this.
+
+    Matches documented behavior of run-parts in debianutils v2.28.2, dated 2007.
+    """
+    # From run-parts(8).
+    lanana_re   = re.compile('^[a-z0-9]+$')
+    lsb_re      = re.compile('^_?([a-z0-9_.]+-)+[a-z0-9]+$')
+    deb_cron_re = re.compile('^[a-z0-9][a-z0-9-]*$')
+    for name in os.listdir(dirname):
+        if lanana_re.match(name) or lsb_re.match(name) or deb_cron_re.match(name):
+            yield os.path.join(dirname, name)
+
 def list_files():
     yield src_path
-    for name in os.listdir(src_dirpath):
-        yield os.path.join(src_dirpath, name)
+    for name in run_parts_list(src_dirpath):
+        yield name
 
 def load_master():