pf-tools/pf-tools: update and fix doc

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/4b315cf679d4
changeset: 1372:4b315cf679d4
user:      shad
date:      Wed Dec 10 13:41:39 2014 +0100
description:
update and fix doc

diffstat:

 doc/updatefile-syntax         |  24 ++++++++++++------------
 lib/PFTools/Update/ADDFILE.pm |   7 +++++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diffs (54 lines):

diff -r 1278a6b4c2ed -r 4b315cf679d4 doc/updatefile-syntax
--- a/doc/updatefile-syntax	Wed Dec 10 13:28:01 2014 +0100
+++ b/doc/updatefile-syntax	Wed Dec 10 13:41:39 2014 +0100
@@ -185,21 +185,21 @@
 						 - FILE:                  resolve to	/module/FILE/
 						 - FILESITE:              resolve to	/module/SITE/pop/FILE/	(if the hosttype of machine is pop-bar)
 						 - FILESITE_foo:          resolve to	/module/SITE/foo/FILE/
-						 - HOST:                  resolve to	/module/CONFIG/pop-bar/	(if the hosttype of machine is pop-bar)
-						 - HOSTSITE:              resolve to	/module/SITE/pop/CONFIG/pop-bar/	(if the hosttype of machine is pop-bar)
-						 - HOSTSITE_foo:          resolve to	/module/SITE/foo/CONFIG/pop-bar/	(if the hosttype of machine is pop-bar)
-						 - HOSTNAME:              resolve to	/module/CONFIG/pop-bar00/	(if the hostname of machine is pop-bar00)
-						 - HOSTNAMESITE:          resolve to	/module/SITE/pop/CONFIG/pop-bar00/	(if the hostname of machine is pop-bar00)
-						 - HOSTNAMESITE_foo:      resolve to	/module/SITE/foo/CONFIG/pop-bar00/	(if the hostname of machine is pop-bar00)
+						 - HOST:                  resolve to	/module/FILE/pop-bar/	(if the hosttype of machine is pop-bar)
+						 - HOSTSITE:              resolve to	/module/SITE/pop/FILE/pop-bar/	(if the hosttype of machine is pop-bar)
+						 - HOSTSITE_foo:          resolve to	/module/SITE/foo/FILE/pop-bar/	(if the hosttype of machine is pop-bar)
+						 - HOSTNAME:              resolve to	/module/FILE/pop-bar00/	(if the hostname of machine is pop-bar00)
+						 - HOSTNAMESITE:          resolve to	/module/SITE/pop/FILE/pop-bar00/	(if the hostname of machine is pop-bar00)
+						 - HOSTNAMESITE_foo:      resolve to	/module/SITE/foo/FILE/pop-bar00/	(if the hostname of machine is pop-bar00)
 						 - MODEL:                 resolve to	/module/MODEL/
 						 - MODELSITE:             resolve to	/module/SITE/pop/MODEL/ (if the hosttype of machine is pop-bar)
 						 - MODELSITE_foo:         resolve to	/module/SITE/foo/MODEL/
 						 - SITE:                  resolve to	/module/SITE/
 						 - SITE_foo:              resolve to	/module/SITE/foo/
-						 - SHORTHOST:             resolve to	/module/CONFIG/bar/	(if the hosttype of machine is pop-bar)
-						 - SHORTHOSTSITE:         resolve to	/module/SITE/pop/CONFIG/bar/	(if the hosttype of machine is pop-bar)
-						 - SHORTHOSTSITE_foo:     resolve to	/module/SITE/SITE/foo/CONFIG/bar/	(if the hosttype of machine is pop-bar)
-						 - SHORTHOSTNAME:         resolve to	/module/CONFIG/bar00/	(if the hostname of machine is pop-bar00)
-						 - SHORTHOSTNAMESITE:     resolve to	/module/SITE/pop/CONFIG/bar00/	(if the hostname of machine is pop-bar00)
-						 - SHORTHOSTNAMESITE_foo: resolve to	/module/SITE/SITE/foo/CONFIG/bar00/	(if the hostname of machine is pop-bar00)
+						 - SHORTHOST:             resolve to	/module/FILE/bar/	(if the hosttype of machine is pop-bar)
+						 - SHORTHOSTSITE:         resolve to	/module/SITE/pop/FILE/bar/	(if the hosttype of machine is pop-bar)
+						 - SHORTHOSTSITE_foo:     resolve to	/module/SITE/foo/FILE/bar/	(if the hosttype of machine is pop-bar)
+						 - SHORTHOSTNAME:         resolve to	/module/FILE/bar00/	(if the hostname of machine is pop-bar00)
+						 - SHORTHOSTNAMESITE:     resolve to	/module/SITE/pop/FILE/bar00/	(if the hostname of machine is pop-bar00)
+						 - SHORTHOSTNAMESITE_foo: resolve to	/module/SITE/foo/FILE/bar00/	(if the hostname of machine is pop-bar00)
 						 - ROOT:                  resolve to	/module/
diff -r 1278a6b4c2ed -r 4b315cf679d4 lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm	Wed Dec 10 13:28:01 2014 +0100
+++ b/lib/PFTools/Update/ADDFILE.pm	Wed Dec 10 13:41:39 2014 +0100
@@ -68,8 +68,11 @@
     # /FILE/common/
 
     my @search_dirs = (
-        'HOSTNAMESITE',  'HOSTSITE',  'HOSTNAME', 'HOST',
-        'SHORTHOSTSITE', 'SHORTHOST', 'FILE:common/'
+        'HOSTNAMESITE',      'HOSTSITE',
+        'HOSTNAME',          'HOST',
+        'SHORTHOSTNAMESITE', 'SHORTHOSTSITE',
+        'SHORTHOSTNAME',     'SHORTHOST',
+        'FILE:common/',
     );
 
     my $source;