1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
Return-Path: <obnam-dev-bounces@obnam.org>
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 C40B323DBC
for <distix@pieni.net>; Sun, 29 Jan 2017 11:01:05 +0100 (CET)
Received: from platypus.pepperfish.net (unknown [10.112.100.20])
by bagpuss.pepperfish.net (Postfix) with ESMTP id 1C082B86;
Sun, 29 Jan 2017 10:01:05 +0000 (GMT)
Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1cXmIC-0004Ig-PA; Sun, 29 Jan 2017 10:01:04 +0000
Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1cXmIB-0004IU-9k
for <obnam-dev@obnam.org>; Sun, 29 Jan 2017 10:01:03 +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 <ijc@hellion.org.uk>) id 1cXmI9-0000Vt-3a
for obnam-dev@obnam.org; Sun, 29 Jan 2017 10:01:03 +0000
Received: from cpc91198-cmbg18-2-0-cust103.5-4.cable.virginm.net
([81.98.98.104] helo=dagon.hellion.org.uk)
by benson.default.arb33.uk0.bigv.io with esmtpsa
(TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.80)
(envelope-from <ijc@hellion.org.uk>)
id 1cXmI1-0006S7-0Q; Sun, 29 Jan 2017 10:00:53 +0000
Message-ID: <1485684052.7612.7.camel@hellion.org.uk>
From: Ian Campbell <ijc@hellion.org.uk>
To: SanskritFritz <sanskritfritz@gmail.com>
Date: Sun, 29 Jan 2017 10:00:52 +0000
In-Reply-To: <CAExbbMzqn4jF3ZWpUL_-0GcoTRMmKtsNtUAa83w+oRjuN5VNfw@mail.gmail.com>
References: <CAExbbMyj78W70YReRW28mLU+ckPPH+D=Qu0PyLwd86W4BNjBpQ@mail.gmail.com>
<1485518787.6091.12.camel@hellion.org.uk>
<CAExbbMzigpV3FreXakFEALqGC_gqR0+AbvffhgOJ2LRqJyuJZw@mail.gmail.com>
<CAExbbMyBX+1xfft-b8+ExnzucYzOKkaMaf4YqKwc=cvs5v+R9w@mail.gmail.com>
<CAExbbMzqn4jF3ZWpUL_-0GcoTRMmKtsNtUAa83w+oRjuN5VNfw@mail.gmail.com>
Content-Type: multipart/mixed; boundary="=-FGeSMXE0e0Ik+Xte4ct+"
X-Mailer: Evolution 3.22.3-1
Mime-Version: 1.0
X-Pepperfish-Transaction: da10-5177-9d28-b10a
X-Spam-Score: -2.1
X-Spam-Score-int: -20
X-Spam-Bar: --
X-Scanned-By: pepperfish.net, Sun, 29 Jan 2017 10:01:03 +0000
X-Spam-Report: Content analysis details: (-2.1 points)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.3 PPF_FROM_UK RBL: A Received line involves an address from the UK
[81.98.98.104 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]
0.1 PPF_SPLIT_TAG RAW: Body contains a split HTML tag
X-ACL-Warn: message may be spam
X-Scan-Signature: 790749604c9e274f8476ddd9df4e30d2
Cc: Obnam development <obnam-dev@obnam.org>
Subject: Re: Kdirstat merged to Qdirstat
X-BeenThere: obnam-dev@obnam.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Obnam development discussions <obnam-dev-obnam.org>
List-Unsubscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
<mailto:obnam-dev-request@obnam.org?subject=unsubscribe>
List-Archive: <http://listmaster.pepperfish.net/pipermail/obnam-dev-obnam.org>
List-Post: <mailto:obnam-dev@obnam.org>
List-Help: <mailto:obnam-dev-request@obnam.org?subject=help>
List-Subscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
<mailto:obnam-dev-request@obnam.org?subject=subscribe>
Sender: obnam-dev-bounces@obnam.org
Errors-To: obnam-dev-bounces@obnam.org
--=-FGeSMXE0e0Ik+Xte4ct+
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 8bit
On Sat, 2017-01-28 at 01:10 +0100, SanskritFritz wrote:
> On Fri, Jan 27, 2017 at 8:58 PM, SanskritFritz <sanskritfritz@gmail.c
> om> wrote:
> > I hope to fix this some day and present a patch too, but my python-
> fu
> > is quite weak yet.
>
> OK, I think I found the cause and hereby present patch to you. I have
> tested this with qdirstat and the result is good.
>
> 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))
I monkey patched this into my local install (i.e. I directly edited
/usr/lib/python2.7/dist-packages/obnamlib/plugins/show_plugin.py, which
is very naughty of me) and for a non-/ root backup the diff in the
kdirstat is:
$ diff -u before after
--- before 2017-01-29 09:46:23.546378982 +0000
+++ after 2017-01-29 09:45:44.378570390 +0000
@@ -5,6 +5,7 @@
#
# Type path size mtime <optional fields>
+D / 4096 0x587c8af7
D /local 4096 0x50559ae2
D /local/scratch 4096 0x50559afe
D /local/scratch/ijc 4096 0x50559b18
Unfortunately loading the "after" version into k4dirstat produces a UI
which shows only / itself and none of its children :-( Loading the
"before" version works. (this backup contains nothing of interest, so
I've attach both files)
I don't have any / rooted backups to try with unfortunately.
Perhaps what is needed instead of the `file == "/"` check is a check
something like "is the filename under the backup root prefix" (i.e.
`not filename.startswith(backuproot)`, but I don't know where to get
the backuproot from).
I think the issues likely correspond to this bit of
https://github.com/shundhammer/qdirstat/blob/master/doc/cache-file-format.txt
Path or Name
------------
Either an absolute path (starting with "/") or only a base name
relative to the last preceding full path in the file.
and confusion as to what it means to be the basename of "/". Obnam
always outputs absolute paths though so should be ok. Maybe this is
something where shundhammer could advise? Given that obnam follows the
file format spec (I believe) perhaps it is even a *dirstat bug.
Ian.
--=-FGeSMXE0e0Ik+Xte4ct+
Content-Disposition: attachment; filename="after"
Content-Type: text/plain; name="after"; charset="ISO-8859-1"
Content-Transfer-Encoding: base64
W2tkaXJzdGF0IDQuMCBjYWNoZSBmaWxlXQojIEdlbmVyYXRlZCBieSBvYm5hbSBHZW5lcmF0aW9u
IDkyICgyMDE3LTAxLTI5IDA0OjIyOjM0ICswMDAwIC0gMjAxNy0wMS0yOSAwNDoyMjozNSArMDAw
MCkKCiMgRG8gbm90IGVkaXQhCiMKIyBUeXBlICBwYXRoICAgICAgICAgICAgc2l6ZSAgICBtdGlt
ZSAgICAgICAgICAgPG9wdGlvbmFsIGZpZWxkcz4KCkQgLwk0MDk2CTB4NTg3YzhhZjcKRCAvbG9j
YWwJNDA5NgkweDUwNTU5YWUyCkQgL2xvY2FsL3NjcmF0Y2gJNDA5NgkweDUwNTU5YWZlCkQgL2xv
Y2FsL3NjcmF0Y2gvaWpjCTQwOTYJMHg1MDU1OWIxOApEIC9sb2NhbC9zY3JhdGNoL2lqYy9EZXNr
dG9wCTQwOTYJMHg1MDU1OWIxOApEIC9sb2NhbC9zY3JhdGNoL2lqYy9EZXNrdG9wL0Rvd25sb2Fk
cwk0MDk2CTB4NTA1NTliMTgKRCAvbG9jYWwvc2NyYXRjaC9pamMvZGV2ZWxvcG1lbnQJNDA5Ngkw
eDUwNTU5YjM2CkQgL2xvY2FsL3NjcmF0Y2gvaWpjL2RldmVsb3BtZW50L2RlYmlhbgk0MDk2CTB4
NTQ0M2JmYjEKRCAvbG9jYWwvc2NyYXRjaC9pamMvdG1wCTQwOTYJMHg1NDg3ZmIwYwo=
--=-FGeSMXE0e0Ik+Xte4ct+
Content-Disposition: attachment; filename="before"
Content-Type: text/plain; name="before"; charset="ISO-8859-1"
Content-Transfer-Encoding: base64
W2tkaXJzdGF0IDQuMCBjYWNoZSBmaWxlXQojIEdlbmVyYXRlZCBieSBvYm5hbSBHZW5lcmF0aW9u
IDkyICgyMDE3LTAxLTI5IDA0OjIyOjM0ICswMDAwIC0gMjAxNy0wMS0yOSAwNDoyMjozNSArMDAw
MCkKCiMgRG8gbm90IGVkaXQhCiMKIyBUeXBlICBwYXRoICAgICAgICAgICAgc2l6ZSAgICBtdGlt
ZSAgICAgICAgICAgPG9wdGlvbmFsIGZpZWxkcz4KCkQgL2xvY2FsCTQwOTYJMHg1MDU1OWFlMgpE
IC9sb2NhbC9zY3JhdGNoCTQwOTYJMHg1MDU1OWFmZQpEIC9sb2NhbC9zY3JhdGNoL2lqYwk0MDk2
CTB4NTA1NTliMTgKRCAvbG9jYWwvc2NyYXRjaC9pamMvRGVza3RvcAk0MDk2CTB4NTA1NTliMTgK
RCAvbG9jYWwvc2NyYXRjaC9pamMvRGVza3RvcC9Eb3dubG9hZHMJNDA5NgkweDUwNTU5YjE4CkQg
L2xvY2FsL3NjcmF0Y2gvaWpjL2RldmVsb3BtZW50CTQwOTYJMHg1MDU1OWIzNgpEIC9sb2NhbC9z
Y3JhdGNoL2lqYy9kZXZlbG9wbWVudC9kZWJpYW4JNDA5NgkweDU0NDNiZmIxCkQgL2xvY2FsL3Nj
cmF0Y2gvaWpjL3RtcAk0MDk2CTB4NTQ4N2ZiMGMK
--=-FGeSMXE0e0Ik+Xte4ct+
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
--=-FGeSMXE0e0Ik+Xte4ct+--
|
