[or-cvs] Forward port debian/patches/07_log_to_file_by_default.dpatc...

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria:/tmp/cvs-serv19723/debian/patches

Modified Files:
	07_log_to_file_by_default.dpatch 
Log Message:
Forward port debian/patches/07_log_to_file_by_default.dpatch again

Index: 07_log_to_file_by_default.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/07_log_to_file_by_default.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- 07_log_to_file_by_default.dpatch	11 Dec 2005 15:44:59 -0000	1.5
+++ 07_log_to_file_by_default.dpatch	10 Jan 2006 23:18:48 -0000	1.6
@@ -29,7 +29,7 @@ diff -urNad tor-0.1.1.5/src/or/config.c 
 @@ -1548,7 +1548,7 @@
  
    /* Special case on first boot if no Log options are given. */
-   if (!old_options && !options->Logs) {
+   if (!options->Logs && !from_setconf) {
 -    config_line_append(&options->Logs, "Log", "notice stdout");
 +    config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");
    }