← Back to branch summary

~ubuntu-branches/ubuntu/trusty/logrotate/trusty

« back to all changes in this revision

Viewing changes to .pc/chown-484762.patch/logrotate.c

  • Committer: Steve Langasek
  • Date: 2014-01-22 19:04:27 UTC
  • mfrom: (4.1.17 sid)
  • Revision ID: steve.langasek@canonical.com-20140122190427-sye921ulvadszicm
Merge version 3.8.7-1 from Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/chown-484762.patch/logrotate.c
830
830
                return 0;
831
831
        }
832
832
 
833
 
    if (log->criterium == ROT_SIZE) {
 
833
    if (force) {
 
834
        /* user forced rotation of logs from command line */
 
835
        state->doRotate = 1;   
 
836
    }
 
837
    else if (log->criterium == ROT_SIZE) {
834
838
        state->doRotate = (sb.st_size >= log->threshhold);
835
 
    } else if (force) {
836
 
        /* user forced rotation of logs from command line */
837
 
        state->doRotate = 1;
838
839
    } else if (mktime(&state->lastRotated) - mktime(&now) > (25 * 3600)) {
839
840
        /* 25 hours allows for DST changes as well as geographical moves */
840
841
        message(MESS_ERROR,