1 Return-Path: <pioto@pioto.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id D3D47431FAF
\r
6 for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:11 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Q4sVCOlIyhhh for <notmuch@notmuchmail.org>;
\r
16 Fri, 25 May 2012 06:44:11 -0700 (PDT)
\r
17 Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com
\r
18 [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C117E431FBC
\r
21 for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:10 -0700 (PDT)
\r
22 Received: by mail-vb0-f53.google.com with SMTP id fc26so989685vbb.26
\r
23 for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:10 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
27 :x-gm-message-state;
\r
28 bh=wqnCBTyD2FpJpDCZPSty5r/Hr3FLgWi1C1GsJLz5yzA=;
\r
29 b=cQ0AvEvVjzrxad5nsRP8N0tgQJmJhBRueZiYwt1PWS9th0/5DXpVN0001JUEy+DWTR
\r
30 aDvtpErsXtJVipO6vv+Uti7WZEcq1uA9G0oFDkDUSR+Xdk0OGDm8H1mA5F2g7Xa00jf2
\r
31 0vHCgGomBK2ycZLLjSr9byzR5BWtwTcSf75rn6HkNz0m2UDmUvtFwHHoon9noL7ObdnE
\r
32 cwb5XY4RyBVYuIldG+hEhEkCbfrMV0mRAVkOIhZ9Y6FsWbSVgHWxsLC6pSPl/Ps6dbqk
\r
33 hDbTlVjCKbpC7XPaQL5b0Sr9IXIjngogyw3Mtt9WVLYDnq0DT+OgMtiGwjZodA+bIwYa
\r
35 Received: by 10.220.222.74 with SMTP id if10mr3693187vcb.27.1337953450589;
\r
36 Fri, 25 May 2012 06:44:10 -0700 (PDT)
\r
37 Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.
\r
39 by mx.google.com with ESMTPS id i19sm4238346vdj.13.2012.05.25.06.44.10
\r
40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
41 Fri, 25 May 2012 06:44:10 -0700 (PDT)
\r
42 Received: by nas.home.pioto.org (Postfix, from userid 1001)
\r
43 id 801BB287D5; Fri, 25 May 2012 09:44:09 -0400 (EDT)
\r
44 From: Mike Kelly <pioto@pioto.org>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: [PATCH 08/10] test/atomicity: use a more portable 'cp' form
\r
47 Date: Fri, 25 May 2012 09:43:29 -0400
\r
48 Message-Id: <1337953411-21000-9-git-send-email-pioto@pioto.org>
\r
49 X-Mailer: git-send-email 1.7.10.2
\r
50 In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>
\r
51 References: <1337953411-21000-1-git-send-email-pioto@pioto.org>
\r
53 ALoCoQnxkjhGJSEpFAt4Gv3adcvAyB7W6QDuXn6gKUibYy44FrPjUOLglHNglVnztzoy/d6XUB6y
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Fri, 25 May 2012 13:44:12 -0000
\r
68 -a already implies -r/-R, so no need for both.
\r
70 FreeBSD's cp complains:
\r
72 cp: the -R and -r options may not be specified together
\r
74 test/atomicity | 2 +-
\r
75 1 file changed, 1 insertion(+), 1 deletion(-)
\r
77 diff --git a/test/atomicity b/test/atomicity
\r
78 index 6df0a00..1c786fa 100755
\r
79 --- a/test/atomicity
\r
80 +++ b/test/atomicity
\r
81 @@ -51,7 +51,7 @@ if test_require_external_prereq gdb; then
\r
83 # Prepare a snapshot of the updated maildir. The gdb script will
\r
84 # update the database in this snapshot as it goes.
\r
85 - cp -ra $MAIL_DIR $MAIL_DIR.snap
\r
86 + cp -a $MAIL_DIR $MAIL_DIR.snap
\r
87 cp ${NOTMUCH_CONFIG} ${NOTMUCH_CONFIG}.snap
\r
88 NOTMUCH_CONFIG=${NOTMUCH_CONFIG}.snap notmuch config set database.path $MAIL_DIR.snap
\r