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
|
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 D83C32318B
for <distix@pieni.net>; Wed, 26 Oct 2016 15:08:13 +0200 (CEST)
Received: from platypus.pepperfish.net (unknown [10.112.100.20])
by bagpuss.pepperfish.net (Postfix) with ESMTP id 786FCC06;
Wed, 26 Oct 2016 14:08:13 +0100 (BST)
Received: from ip6-localhost ([::1] helo=platypus.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1bzNwC-0001PN-TU; Wed, 26 Oct 2016 14:08:13 +0100
Received: from inmail0 ([10.112.100.10] helo=mx0.pepperfish.net)
by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
id 1bzNwC-0001PB-4T
for <obnam-dev@obnam.org>; Wed, 26 Oct 2016 14:08:12 +0100
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-relay-phiayoh8@benson.default.arb33.uk0.bigv.io>)
id 1bzNw6-0004Lt-G9
for obnam-dev@obnam.org; Wed, 26 Oct 2016 14:08:12 +0100
Received: from cpc91198-cmbg18-2-0-cust103.5-4.cable.virginm.net
([81.98.98.104] helo=celaeno.hellion.org.uk)
by benson.default.arb33.uk0.bigv.io with esmtpsa
(TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80)
(envelope-from <ijc-relay-phiayoh8@benson.default.arb33.uk0.bigv.io>)
id 1bzNvz-0005TF-Em; Wed, 26 Oct 2016 14:07:59 +0100
Received: from dagon.hellion.org.uk ([192.168.1.7])
by celaeno.hellion.org.uk with smtp (Exim 4.84_2)
(envelope-from <ijc@hellion.org.uk>)
id 1bzNvx-00081w-NI; Wed, 26 Oct 2016 14:07:58 +0100
Received: by dagon.hellion.org.uk (sSMTP sendmail emulation);
Wed, 26 Oct 2016 14:07:57 +0100
From: Ian Campbell <ijc@hellion.org.uk>
To: obnam-dev@obnam.org
Date: Wed, 26 Oct 2016 14:07:57 +0100
Message-Id: <20161026130757.23533-1-ijc@hellion.org.uk>
X-Mailer: git-send-email 2.9.3
X-Pepperfish-Transaction: 4597-94a9-5751-1a6c
X-Spam-Score: -3.6
X-Spam-Score-int: -35
X-Spam-Bar: ---
X-Scanned-By: pepperfish.net, Wed, 26 Oct 2016 14:08:12 +0100
X-Spam-Report: Content analysis details: (-3.6 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]
-1.4 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: 0a2d208676412f7de12dd7144bb8abc1
Cc: Ian Campbell <ijc@hellion.org.uk>
Subject: [PATCH] kdirstat: Correct output syntax for FIFO
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
There needs to be some whitspace after the FIFO tag, otherwise k4dirstat
(silently!) stops parsing at this entry.
This was wrong in the initial commit to add FIFO support to kdirstat
4ce858d7c593 ("kdirstat: Handled named pipes (fifos)"), manual testing at the
time apparently only verified that the file was generated, not that it was
valid, sorry.
I updated the test yarns to also check for FIFO, however this is only run
"ASSUMING extended attributes are allowed for users", which does not appear to
be the case on my system. Also the testshould probably test for all sorts of
files, not just regular and FIFO.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
obnamlib/plugins/show_plugin.py | 2 +-
yarns/0300-kdirstat-integration.yarn | 4 ++--
yarns/9000-implements.yarn | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
index 31a241a..995a958 100644
--- a/obnamlib/plugins/show_plugin.py
+++ b/obnamlib/plugins/show_plugin.py
@@ -303,7 +303,7 @@ class ShowPlugin(obnamlib.ObnamPlugin):
elif stat.S_ISCHR(mode):
mode_str = "CharDev\t"
elif stat.S_ISFIFO(mode):
- mode_str = "FIFO"
+ mode_str = "FIFO\t"
elif stat.S_ISSOCK(mode):
mode_str = "Socket\t"
else:
diff --git a/yarns/0300-kdirstat-integration.yarn b/yarns/0300-kdirstat-integration.yarn
index 695994f..6408908 100644
--- a/yarns/0300-kdirstat-integration.yarn
+++ b/yarns/0300-kdirstat-integration.yarn
@@ -15,7 +15,7 @@ file.
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
+ AND for each entry in directory L a line in the kdircache C matches it
Now a backup containing some interesting objects
@@ -25,7 +25,7 @@ Now a backup containing some interesting 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
+ AND for each entry in directory L a line in the kdircache C matches it
Validating the cache file
-------------------------
diff --git a/yarns/9000-implements.yarn b/yarns/9000-implements.yarn
index 1d898d7..e77b785 100644
--- a/yarns/9000-implements.yarn
+++ b/yarns/9000-implements.yarn
@@ -773,7 +773,10 @@ Check that the cache mentions each file in the repository. Since grep
-E cannot specifically match a tab we check only for one character of
whitespace.
- IMPLEMENTS THEN for each file in directory (\S+) a line in the kdircache (\S+) matches it
+ IMPLEMENTS THEN for each entry in directory (\S+) a line in the kdircache (\S+) matches it
find "$DATADIR/$MATCH_1" -type f | while read f ; do \
grep -E -e "^F[[:space:]]$f" "$DATADIR/$MATCH_2" || exit 1; \
done
+ find "$DATADIR/$MATCH_1" -type p | while read p ; do \
+ grep -E -e "^FIFO[[:space:]]$p" "$DATADIR/$MATCH_2" || exit 1; \
+ done
--
2.9.3
_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
|
