[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5604dc748d0c38a05d2f909aedbe50d8d05684e7

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  5604dc748d0c38a05d2f909aedbe50d8d05684e7 (commit)
      from  2bf7ee4bddce8dc91caf4f4639e5152264161444 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5604dc748d0c38a05d2f909aedbe50d8d05684e7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Mar 6 17:22:18 2015 +0100

    backup: make include file parsing more robust.

-----------------------------------------------------------------------

Summary of changes:
 config/backup/backup.pl                  | 8 +++-----
 config/rootfiles/core/88/filelists/files | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index f4823fc..d430f34 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -160,12 +160,10 @@ sub createinclude(){
   close(DATEI);
   
   foreach (@Zeilen){
-  if ( $_ =~ /\*/){
-    my @files = `ls $_`;
+    chomp($_);
+    my @files = `find $_ -maxdepth 0 2>/dev/null`;
     foreach (@files){
       push(@include,$_);
-     }
-   }
-  else {push(@include,$_);}
+    }
   }
 }
diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files
index 5ee23b9..0251b5d 100644
--- a/config/rootfiles/core/88/filelists/files
+++ b/config/rootfiles/core/88/filelists/files
@@ -2,4 +2,5 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/backup/bin/backup.pl
 var/ipfire/langs


hooks/post-receive
--
IPFire 2.x development tree