pf-tools commit: r866 [ccaillet-guest] - in /branches/next-gen: doc/updatefile-syntax lib/PFTools/Update.pm

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

Author: ccaillet-guest
Date: Tue Aug 31 09:06:38 2010
New Revision: 866

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=866
Log:
doc/updatefile-syntax
  - adding section for actiongroup
  - adding a warning for duplicate sections name into a same file

lib/PFTools/Update.pm
  - removing alphabetical ordering for preserving parsing order for sections
  with the same prio


Modified:
    branches/next-gen/doc/updatefile-syntax
    branches/next-gen/lib/PFTools/Update.pm

Modified: branches/next-gen/doc/updatefile-syntax
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/doc/updatefile-syntax?rev=866&op=diff
==============================================================================
--- branches/next-gen/doc/updatefile-syntax (original)
+++ branches/next-gen/doc/updatefile-syntax Tue Aug 31 09:06:38 2010
@@ -1,3 +1,10 @@
+WARNING :
+	According to usage of Config::IniFiles parser, if a section is declared at multiple times,
+	the parsing will contain only one section ... which cause configuration errors.
+
+SO BE CAREFULL WITH your definition into a single file.
+
+
 SYNOPSYS : addfile or creatfile
 	* addfile		: adding a file and updating it according to the source
 	* createfile	: creating a file from source or "touch" it if no source is defined. If the file
@@ -8,6 +15,8 @@
 	? depends		::= space separated list for handling section's depends
 	! source		::= space separated list containing the source(s) file(s). Each element are concatenated
 						in order defined
+	? actiongroup	::= if this directive is specified then ignore directives on_config, before_change
+						on_noaction and after_change and use the trigger defined in actiongroup section
 	? filter		::= command(s) which is(are) executed for filtering source to obtain the final file. You
 						can use backslash char for using multiline command(s) like in bash script
 	? owner			::= username or UID for the result file. Default user is root
@@ -106,3 +115,21 @@
 	? after_change	::= command(s) which is(are) executed after changing the file, if noaction parameter
 						is used with update-config, this(these) command(s) is(are) ignored. You can use
 						backslash char for using multiline command(s) like in bash script
+
+SYNOPSYS : actiongroup
+	* actiongroup : defining here commands which will be executed after treatment of all sections which use this actiongroup
+
+[<actiongroup>]
+	! actiongroup	::= actiongroup
+	? on_config		::= command(s) which is(are) executed before changing the file even if noaction parameter
+						is used with update-config command. You can use backslash char for using multiline
+						command(s) like in bash script
+	? before_change	::= command(s) which is(are) executed before changing the file, if noaction parameter
+						is used with update-config, this(these) command(s) is(are) ignored. You can use
+						backslash char for using multiline command(s) like in bash script
+	? on_noaction	::= command(s) which is(are) executed after changing the file even if noaction parameter
+						is used with update-config command. You can use backslash char for using multiline
+						command(s) like in bash script
+	? after_change	::= command(s) which is(are) executed after changing the file, if noaction parameter
+						is used with update-config, this(these) command(s) is(are) ignored. You can use
+						backslash char for using multiline command(s) like in bash script

Modified: branches/next-gen/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update.pm?rev=866&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update.pm (original)
+++ branches/next-gen/lib/PFTools/Update.pm Tue Aug 31 09:06:38 2010
@@ -160,9 +160,9 @@
     if ( $prioa != $priob ) {
 		return $prioa <=> $priob;
     }
-    else {
-		return $a cmp $b;
-    }
+#     else {
+# 		return $a cmp $b;
+#     }
 }
 
 1;