pf-tools/pf-tools: fix include section order and comment in conf...

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/49076f57da68
changeset: 1279:49076f57da68
user:      shad
date:      Fri Apr 25 18:06:25 2014 +0200
description:
fix include section order and comment in config mode

diffstat:

 tools/Translate_old_config |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r a16d485640f9 -r 49076f57da68 tools/Translate_old_config
--- a/tools/Translate_old_config	Fri Apr 25 17:24:32 2014 +0200
+++ b/tools/Translate_old_config	Fri Apr 25 18:06:25 2014 +0200
@@ -118,11 +118,15 @@
         }
     }
     elsif ( $_ =~ m{\A \@include [ ] (.*) }msx ) {
-        if ( $options->{'site'} eq q{UNDEFINED} ) {
-            $current_section = qq{COMMON:/include-$1};
-        }
-        else {
-            $current_section = qq{CONFSITE_$options->{'site'}:/include-$1};
+        if ( $options->{'type'} eq 'config' ) {
+            $current_section = qq{include-$1};
+        } else {
+            if ( $options->{'site'} eq q{UNDEFINED} ) {
+                $current_section = qq{COMMON:/include-$1};
+            }
+            else {
+                $current_section = qq{CONFSITE_$options->{'site'}:/include-$1};
+            }
         }
         $sectionorder{"$current_section"} = $sectionnumber;
         $sectionnumber++;