Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D3D47431FAF for ; Fri, 25 May 2012 06:44:11 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q4sVCOlIyhhh for ; Fri, 25 May 2012 06:44:11 -0700 (PDT) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id C117E431FBC for ; Fri, 25 May 2012 06:44:10 -0700 (PDT) Received: by mail-vb0-f53.google.com with SMTP id fc26so989685vbb.26 for ; Fri, 25 May 2012 06:44:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wqnCBTyD2FpJpDCZPSty5r/Hr3FLgWi1C1GsJLz5yzA=; b=cQ0AvEvVjzrxad5nsRP8N0tgQJmJhBRueZiYwt1PWS9th0/5DXpVN0001JUEy+DWTR aDvtpErsXtJVipO6vv+Uti7WZEcq1uA9G0oFDkDUSR+Xdk0OGDm8H1mA5F2g7Xa00jf2 0vHCgGomBK2ycZLLjSr9byzR5BWtwTcSf75rn6HkNz0m2UDmUvtFwHHoon9noL7ObdnE cwb5XY4RyBVYuIldG+hEhEkCbfrMV0mRAVkOIhZ9Y6FsWbSVgHWxsLC6pSPl/Ps6dbqk hDbTlVjCKbpC7XPaQL5b0Sr9IXIjngogyw3Mtt9WVLYDnq0DT+OgMtiGwjZodA+bIwYa ZkCQ== Received: by 10.220.222.74 with SMTP id if10mr3693187vcb.27.1337953450589; Fri, 25 May 2012 06:44:10 -0700 (PDT) Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net. [71.182.155.97]) by mx.google.com with ESMTPS id i19sm4238346vdj.13.2012.05.25.06.44.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 May 2012 06:44:10 -0700 (PDT) Received: by nas.home.pioto.org (Postfix, from userid 1001) id 801BB287D5; Fri, 25 May 2012 09:44:09 -0400 (EDT) From: Mike Kelly To: notmuch@notmuchmail.org Subject: [PATCH 08/10] test/atomicity: use a more portable 'cp' form Date: Fri, 25 May 2012 09:43:29 -0400 Message-Id: <1337953411-21000-9-git-send-email-pioto@pioto.org> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org> References: <1337953411-21000-1-git-send-email-pioto@pioto.org> X-Gm-Message-State: ALoCoQnxkjhGJSEpFAt4Gv3adcvAyB7W6QDuXn6gKUibYy44FrPjUOLglHNglVnztzoy/d6XUB6y X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2012 13:44:12 -0000 -a already implies -r/-R, so no need for both. FreeBSD's cp complains: cp: the -R and -r options may not be specified together --- test/atomicity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/atomicity b/test/atomicity index 6df0a00..1c786fa 100755 --- a/test/atomicity +++ b/test/atomicity @@ -51,7 +51,7 @@ if test_require_external_prereq gdb; then # Prepare a snapshot of the updated maildir. The gdb script will # update the database in this snapshot as it goes. - cp -ra $MAIL_DIR $MAIL_DIR.snap + cp -a $MAIL_DIR $MAIL_DIR.snap cp ${NOTMUCH_CONFIG} ${NOTMUCH_CONFIG}.snap NOTMUCH_CONFIG=${NOTMUCH_CONFIG}.snap notmuch config set database.path $MAIL_DIR.snap -- 1.7.10.2