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
|
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 AC2052C713
for <distix@pieni.net>; Sat, 3 Oct 2015 13:30:53 +0200 (CEST)
Received: from platypus.pepperfish.net (unknown [10.112.100.20])
by bagpuss.pepperfish.net (Postfix) with ESMTP id 1D2BB5E6;
Sat, 3 Oct 2015 12:30:53 +0100 (BST)
Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1ZiL1g-00040y-Uz; Sat, 03 Oct 2015 12:30:52 +0100
Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1ZiL1f-00040r-H6
for <obnam-dev@obnam.org>; Sat, 03 Oct 2015 12:30:51 +0100
Received: from benson.vm.bytemark.co.uk ([212.110.190.137])
by mx0.pepperfish.net with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128)
(Exim 4.80)
(envelope-from <ijc-relay-phiayoh8@benson.vm.bytemark.co.uk>)
id 1ZiL1c-0004rJ-TI
for obnam-dev@obnam.org; Sat, 03 Oct 2015 12:30:51 +0100
Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginm.net ([86.6.25.227]
helo=celaeno.hellion.org.uk)
by benson.vm.bytemark.co.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128)
(Exim 4.80)
(envelope-from <ijc-relay-phiayoh8@benson.vm.bytemark.co.uk>)
id 1ZiL1W-0001gz-47; Sat, 03 Oct 2015 12:30:42 +0100
Received: from dagon.hellion.org.uk ([192.168.1.7])
by celaeno with smtp (Exim 4.84) (envelope-from <ijc@hellion.org.uk>)
id 1ZiL1U-0005UT-BX; Sat, 03 Oct 2015 12:30:41 +0100
Received: by dagon.hellion.org.uk (sSMTP sendmail emulation);
Sat, 03 Oct 2015 12:30:40 +0100
From: Ian Campbell <ijc@hellion.org.uk>
To: obnam-dev@obnam.org
Date: Sat, 3 Oct 2015 12:30:40 +0100
Message-Id: <1443871840-4436-1-git-send-email-ijc@hellion.org.uk>
X-Mailer: git-send-email 2.5.3
X-Spam-Score: -2.9
X-Spam-Score-int: -28
X-Spam-Bar: --
X-Scanned-By: pepperfish.net, Sat, 03 Oct 2015 12:30:51 +0100
X-Spam-Report: Content analysis details: (-2.9 points)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.3 PPF_FROM_UK RBL: A Received line involves an address from the UK
[86.6.25.227 listed in gb.country.dnsbl.rjek.com]
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low
trust [212.110.190.137 listed in list.dnswl.org]
-0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay
domain
-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: f11bba8f41b8bc2894d5c90ad7eebf09
Cc: Florian Geyer <blueice@fobos.de>, Ian Campbell <ijc@hellion.org.uk>
Subject: [PATCH] kdirstat: Handled named pipes (fifos)
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
For some reason this was missing from the mode_str lookup, it is the only type
listed on
https://github.com/thomas-joiner/k4dirstat/blob/master/kdirstat/cache-file-format.txt
which wasn't handled.
For unknown file types emit a commented "#UNHANDLED ..." line rather than
crashing with a backtrace.
Add a yarn for this scenario, although I've not been able to run it due to
"ASSUMING extended attributes are allowed for users".
Real world use has been tested by Florian Geyer,
http://listmaster.pepperfish.net/pipermail/obnam-support-obnam.org/2015-September/003836.html
Cc: Florian Geyer <blueice@fobos.de>
---
obnamlib/plugins/show_plugin.py | 5 +++++
yarns/0300-kdirstat-integration.yarn | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
index 2e942f0..4b97ea8 100644
--- a/obnamlib/plugins/show_plugin.py
+++ b/obnamlib/plugins/show_plugin.py
@@ -287,8 +287,13 @@ class ShowPlugin(obnamlib.ObnamPlugin):
mode_str = "BlockDev\t"
elif stat.S_ISCHR(mode):
mode_str = "CharDev\t"
+ elif stat.S_ISFIFO(mode):
+ mode_str = "FIFO"
elif stat.S_ISSOCK(mode):
mode_str = "Socket\t"
+ else:
+ # Unhandled, make it look like a comment
+ mode_str = "#UNHANDLED\t"
enc_filename = filename.replace("%", "%25")
enc_filename = enc_filename.replace(" ", "%20")
diff --git a/yarns/0300-kdirstat-integration.yarn b/yarns/0300-kdirstat-integration.yarn
index a2ff8e6..695994f 100644
--- a/yarns/0300-kdirstat-integration.yarn
+++ b/yarns/0300-kdirstat-integration.yarn
@@ -17,6 +17,16 @@ file.
THEN first line of C matches [kdirstat 4.0 cache file]
AND for each file in directory L a line in the kdircache C matches it
+Now a backup containing some interesting objects
+
+ SCENARIO create and do a check of a kdirstat cache of interesting objects
+ ASSUMING extended attributes are allowed for users
+ GIVEN directory L with interesting filesystem objects
+ WHEN user U backs up directory L to repository R
+ AND user U creates a kdirstat cache file C of repository R
+ THEN first line of C matches [kdirstat 4.0 cache file]
+ AND for each file in directory L a line in the kdircache C matches it
+
Validating the cache file
-------------------------
--
2.5.3
_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
|
