Return-Path: X-Original-To: distix@pieni.net Delivered-To: distix@pieni.net Received: from bagpuss.pepperfish.net (bagpuss.pepperfish.net [148.251.8.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pieni.net (Postfix) with ESMTPS id D5B0D24443 for ; Mon, 30 Jan 2017 11:26:45 +0100 (CET) Received: from platypus.pepperfish.net (unknown [10.112.100.20]) by bagpuss.pepperfish.net (Postfix) with ESMTP id 50E5ECE5; Mon, 30 Jan 2017 10:26:45 +0000 (GMT) Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net) by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian)) id 1cY9Ab-0006ZQ-6g; Mon, 30 Jan 2017 10:26:45 +0000 Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net) by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian)) id 1cY9AZ-0006Z9-DQ for ; Mon, 30 Jan 2017 10:26:43 +0000 Received: from mail-qt0-f177.google.com ([209.85.216.177]) by mx0.pepperfish.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1cY9AX-0003gg-HV for obnam-dev@obnam.org; Mon, 30 Jan 2017 10:26:43 +0000 Received: by mail-qt0-f177.google.com with SMTP id k15so199680404qtg.3 for ; Mon, 30 Jan 2017 02:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=aoI1oc26KXFiMt2hyeaUTQoa775BY8PoLb0JTT2gMEg=; b=Gug21+MdX7QgqQJQm2SIfHswdSBvi585qa5PP7ShdqE0/MhzzcNbRS6OVcSE/Ysewl 5au3bza7qo5b5NuF81K4uj1LGnpTY1pdR5gVN8SR0v3bybQxZubkZRVOuqqJI4B2JZWE bFjnU/XnJ5kFgs1qHD+KIFTurG8iFg9yEhhQxzmy6J7+e/s8+RQiPYozSPuBn+UdvXYv y2Sb8/WXDZ6IEVdAERmLOW3ZFKR+lGHJG4mkxBeWxVKpbh8j0afijz4vJftGlE+cl6cv pWuGQj/xnzGmh7KUtKH/UDHmtntlGKNJOr60Mjftm3Y4l8/+tg2/MevuOtcDNgaVpI2O IXGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=aoI1oc26KXFiMt2hyeaUTQoa775BY8PoLb0JTT2gMEg=; b=kpcZ4bft1vAbgDlA3FvsyCJX3yhy73x+iUmSiJBFysYoLxShXuqPjCfish4vz0Y4/o /IR80NkOomxrPG/h2TkBS92S2AIOjnj2H3YgmHZCty0NbyMokBnVi9YrMnZNqzVa6r3S SPYiAGlSz7wJ18h3eDVYBZwK9fvZcLQhYC2OAudplppjhDqHBl14rqBLsCjVr2cjmjfm JfcsIjC2hO2qUgAOXGOqDsB4a6thlq3c6eK1tEuklLaflMzaptJ1Wae0mL5liG+yiRAW jreoftjzjG61zRD/LxHB1vkGoVaDV5A2Q5r/pjDFXC3nG1XNpM7exsO0aKYV+ZhGzjf9 6xRA== X-Gm-Message-State: AIkVDXLQ2PyFzKhqwQA8U5r7nkj8W/rGpRp+xJoaseeAOCNCD7yhFgwMijUJR/ugdaQrizOF+ilFdIvhqTcWXQ== X-Received: by 10.237.60.27 with SMTP id t27mr21267350qte.86.1485771988758; Mon, 30 Jan 2017 02:26:28 -0800 (PST) MIME-Version: 1.0 Received: by 10.237.58.231 with HTTP; Mon, 30 Jan 2017 02:25:48 -0800 (PST) From: SanskritFritz Date: Mon, 30 Jan 2017 11:25:48 +0100 Message-ID: To: Obnam development Content-Type: text/plain; charset=UTF-8 X-Pepperfish-Transaction: 69cd-281f-a924-eccf X-Spam-Score: 2.2 X-Spam-Score-int: 22 X-Spam-Bar: ++ X-Scanned-By: pepperfish.net, Mon, 30 Jan 2017 10:26:43 +0000 X-Spam-Report: Content analysis details: (2.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 PPF_RECEIVED_HTTP Received header mentions http 1.0 PPF_FROM_CONTAINS_MAIL The From header contains 'mail' 1.2 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sanskritfritz[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.216.177 listed in list.dnswl.org] 1.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.216.177 listed in dnsbl.sorbs.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-ACL-Warn: message may be spam X-Scan-Signature: e606bea56426b7460dd1a96e279d41e5 Cc: Ian Campbell Subject: [PATCH] Include the root dir into kdirstat output X-BeenThere: obnam-dev@obnam.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Obnam development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: obnam-dev-bounces@obnam.org Errors-To: obnam-dev-bounces@obnam.org Root directory is now excluded from kdirstat output done by obnam. That solution was probably a workaround to a k4dirstat bug, however, this broke displaying any --root="/" backups and since we now have qdirstat (and k4dirstat became deprecated) which fixed the bug, it is time to reintroduce the root dir into the kdirstat output. Discussion with Ian about this can be read in the thread "Kdirstat merged to Qdirstat". diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py index 995a958c..79ccde10 100644 --- a/obnamlib/plugins/show_plugin.py +++ b/obnamlib/plugins/show_plugin.py @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin): enc_filename = enc_filename.replace(" ", "%20") enc_filename = enc_filename.replace("\t", "%09") - if filename == "/": - return - self.app.output.write( "%s%s\t%d\t%#x\n" % (mode_str, enc_filename, size, mtime_sec)) _______________________________________________ obnam-dev mailing list obnam-dev@obnam.org http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org