~ubuntu-dev/ubuntu/lucid/dovecot/lucid-201002101901

« back to all changes in this revision

Viewing changes to src/lib-storage/index/maildir/maildir-transaction.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-06-28 08:45:43 UTC
  • mfrom: (1.10.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060628084543-pc6v7oikzlvnlnu3
Tags: 1.0.beta9-1ubuntu1
* Merge from debian unstable, resolved minor conflicts.
* debian/control: Removed unnecessary build dependency ssl-cert, add it as
  dovecot-common dependency.
* Remove debian/patches/prohibit_.._mbox_mask.dpatch, upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
                        ret = -1;
31
31
                }
32
32
        }
33
 
        if (t->copy_ctx != NULL) {
34
 
                if (maildir_transaction_copy_commit(t->copy_ctx) < 0)
35
 
                        ret = -1;
36
 
        }
37
33
 
38
34
        save_ctx = t->save_ctx;
39
35
 
56
52
 
57
53
        if (t->save_ctx != NULL)
58
54
                maildir_transaction_save_rollback(t->save_ctx);
59
 
        if (t->copy_ctx != NULL)
60
 
                maildir_transaction_copy_rollback(t->copy_ctx);
61
55
        index_transaction_rollback(_t);
62
56
}