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 81140259A7 for ; Mon, 30 Jan 2017 11:48:20 +0100 (CET) Received: from platypus.pepperfish.net (unknown [10.112.100.20]) by bagpuss.pepperfish.net (Postfix) with ESMTP id 42F63EEF; Mon, 30 Jan 2017 10:48:20 +0000 (GMT) Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net) by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian)) id 1cY9VU-0001L9-4k; Mon, 30 Jan 2017 10:48:20 +0000 Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net) by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian)) id 1cY9VT-0001Kx-02 for ; Mon, 30 Jan 2017 10:48:19 +0000 Received: from benson.default.arb33.uk0.bigv.io ([46.43.0.16]) by mx0.pepperfish.net with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1cY9VQ-0004K2-MF for obnam-dev@obnam.org; Mon, 30 Jan 2017 10:48:18 +0000 Received: from [194.72.166.2] (helo=bokrug.cam.docker.com) by benson.default.arb33.uk0.bigv.io with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1cY9VE-0006m4-HO; Mon, 30 Jan 2017 10:48:05 +0000 Message-ID: <1485773284.2451.44.camel@hellion.org.uk> From: Ian Campbell To: SanskritFritz , Obnam development Date: Mon, 30 Jan 2017 10:48:04 +0000 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Pepperfish-Transaction: 0003-8694-489f-ecfe X-Spam-Score: -2.2 X-Spam-Score-int: -21 X-Spam-Bar: -- X-Scanned-By: pepperfish.net, Mon, 30 Jan 2017 10:48:18 +0000 X-Spam-Report: Content analysis details: (-2.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.3 PPF_FROM_UK RBL: A Received line involves an address from the UK [194.72.166.2 listed in gb.country.dnsbl.rjek.com] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-ACL-Warn: message may be spam X-Scan-Signature: 5488e4e8d8c10b4036f618d89ebffc9d Subject: Re: [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 On Mon, 2017-01-30 at 11:25 +0100, SanskritFritz wrote: > 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". I agree that this return appears to be hiding a k4dirstat issue and should therefore be removed (i.e. I approve of this patch). FYI it seems that k4dirstat has a new upstream at https://bitbucket.org /jeromerobert/k4dirstat which is still active. I have reported https://bitbucket.org/jeromerobert/k4dirstat/issues/23/ issue-with-root-directory-in-cache-file for the issue discovered here. Ian. > 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