Changeset 1525 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

12/22/15 18:02:30 (9 years ago)

Author:

nanardon

Message:

properly add .pp to puppet file output

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Netzone.pm (modified) (1 diff)
• Task/Buildnet.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Netzone.pm

@@ -50 +50 @@
                 get => sub {
                     $_[0]->object->_get_c_field('output') ||
-                    $_[0]->object->id
+                    ($_[0]->object->id . (($_[0]->object->get_attributes('type') || '') eq 'puppet' ? '.pp' : ''))
                 },
             },

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -817 +817 @@
     $output .= "# End of data from database\n";
     my $file = $self->_output_file($ozone);
-    $file =~ s/(\.pp)?$/\.pp/; # adding .pp extension if not existing
     if (open(my $handle, '>', $file)) {
         print $handle $output;