[gentoo-commits] proj/releng:master commit in: tools/ - gentoo-commits

From:	Matt Turner <mattst88@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/releng:master commit in: tools/
Date:	Mon, 01 Feb 2021 04:04:52
Message-Id:	`1612058203.4de1432aa1494b7c2459bb7fa740234a6777eac5.mattst88@gentoo`

1

commit:     4de1432aa1494b7c2459bb7fa740234a6777eac5

2

Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jan 31 00:39:55 2021 +0000

4

Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>

5

CommitDate: Sun Jan 31 01:56:43 2021 +0000

6

URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a

7

8

tools: Add RSYNC_OPTS array

9

10

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

11

12

 tools/catalyst-auto-alpha.conf      |  5 ++++-

13

 tools/catalyst-auto-amd64.conf      | 14 +++++++-------

14

 tools/catalyst-auto-arm.conf        |  5 ++++-

15

 tools/catalyst-auto-arm64.conf      |  5 ++++-

16

 tools/catalyst-auto-hppa.conf       |  5 ++++-

17

 tools/catalyst-auto-ia64.conf       |  5 ++++-

18

 tools/catalyst-auto-ppc.conf        |  5 ++++-

19

 tools/catalyst-auto-ppc64le.conf    |  5 ++++-

20

 tools/catalyst-auto-qemu-arm.conf   |  5 ++++-

21

 tools/catalyst-auto-qemu-riscv.conf |  5 ++++-

22

 tools/catalyst-auto-s390.conf       |  5 ++++-

23

 tools/catalyst-auto-s390x.conf      |  5 ++++-

24

 tools/catalyst-auto-sparc64.conf    |  5 ++++-

25

 tools/catalyst-auto-x86.conf        | 14 +++++++-------

26

 14 files changed, 62 insertions(+), 26 deletions(-)

27

28

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf

29

index ebaff6eb..381171b5 100644

30

--- a/tools/catalyst-auto-alpha.conf

31

+++ b/tools/catalyst-auto-alpha.conf

32

@@ -42,7 +42,10 @@ upload() {

33

 		-o VerifyHostKeyDNS=yes

34

 		-o StrictHostKeyChecking=no

35

)

36

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

37

+	local RSYNC_OPTS=(

38

+		-e "${SSH_CMD[*]}"

39

+	)

40

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

41

}

42

43

 post_build() {

44

45

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf

46

index 0ef11f2f..363c80cb 100644

47

--- a/tools/catalyst-auto-amd64.conf

48

+++ b/tools/catalyst-auto-amd64.conf

49

@@ -74,13 +74,13 @@ upload() {

50

 		-o VerifyHostKeyDNS=yes

51

 		-o StrictHostKeyChecking=no

52

)

53

-	rsync \

54

-	-e "${SSH_CMD[*]}" \

55

-	-a \

56

-	--omit-dir-times \

57

-	--delay-updates \

58

-	"$@" \

59

-	"${UPLOAD_DEST}"

60

+	local RSYNC_OPTS=(

61

+		-e "${SSH_CMD[*]}"

62

+		--archive

63

+		--omit-dir-times

64

+		--delay-updates

65

+	)

66

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}

67

}

68

69

 post_build() {

70

71

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf

72

index 26fe8156..eaae0399 100644

73

--- a/tools/catalyst-auto-arm.conf

74

+++ b/tools/catalyst-auto-arm.conf

75

@@ -64,7 +64,10 @@ upload() {

76

 		-o VerifyHostKeyDNS=yes

77

 		-o StrictHostKeyChecking=no

78

)

79

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

80

+	local RSYNC_OPTS=(

81

+		-e "${SSH_CMD[*]}"

82

+	)

83

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

84

     else

85

 	echo Would now upload "$@"

86

 	ls -l $@

87

88

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf

89

index 9f457989..1bd94ae9 100644

90

--- a/tools/catalyst-auto-arm64.conf

91

+++ b/tools/catalyst-auto-arm64.conf

92

@@ -36,7 +36,10 @@ upload() {

93

 		-o VerifyHostKeyDNS=yes

94

 		-o StrictHostKeyChecking=no

95

)

96

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

97

+	local RSYNC_OPTS=(

98

+		-e "${SSH_CMD[*]}"

99

+	)

100

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

101

}

102

103

 post_build() {

104

105

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf

106

index 8b465421..3b93e4ec 100644

107

--- a/tools/catalyst-auto-hppa.conf

108

+++ b/tools/catalyst-auto-hppa.conf

109

@@ -42,7 +42,10 @@ upload() {

110

 		-o VerifyHostKeyDNS=yes

111

 		-o StrictHostKeyChecking=no

112

)

113

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

114

+	local RSYNC_OPTS=(

115

+		-e "${SSH_CMD[*]}"

116

+	)

117

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

118

}

119

120

 post_build() {

121

122

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf

123

index 6c78c8a7..2d87a837 100644

124

--- a/tools/catalyst-auto-ia64.conf

125

+++ b/tools/catalyst-auto-ia64.conf

126

@@ -35,7 +35,10 @@ upload() {

127

 		-o VerifyHostKeyDNS=yes

128

 		-o StrictHostKeyChecking=no

129

)

130

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

131

+	local RSYNC_OPTS=(

132

+		-e "${SSH_CMD[*]}"

133

+	)

134

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

135

}

136

137

 post_build() {

138

139

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf

140

index a1286726..615c3f55 100644

141

--- a/tools/catalyst-auto-ppc.conf

142

+++ b/tools/catalyst-auto-ppc.conf

143

@@ -41,7 +41,10 @@ upload() {

144

 		-o VerifyHostKeyDNS=yes

145

 		-o StrictHostKeyChecking=no

146

)

147

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

148

+	local RSYNC_OPTS=(

149

+		-e "${SSH_CMD[*]}"

150

+	)

151

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

152

}

153

154

 post_build() {

155

156

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf

157

index 0d54fab9..e2394932 100644

158

--- a/tools/catalyst-auto-ppc64le.conf

159

+++ b/tools/catalyst-auto-ppc64le.conf

160

@@ -42,7 +42,10 @@ upload() {

161

 		-o VerifyHostKeyDNS=yes

162

 		-o StrictHostKeyChecking=no

163

)

164

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

165

+	local RSYNC_OPTS=(

166

+		-e "${SSH_CMD[*]}"

167

+	)

168

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

169

}

170

171

 post_build() {

172

173

diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf

174

index 1a121997..e6075ec3 100644

175

--- a/tools/catalyst-auto-qemu-arm.conf

176

+++ b/tools/catalyst-auto-qemu-arm.conf

177

@@ -65,7 +65,10 @@ upload() {

178

 		-o VerifyHostKeyDNS=yes

179

 		-o StrictHostKeyChecking=no

180

)

181

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

182

+	local RSYNC_OPTS=(

183

+		-e "${SSH_CMD[*]}"

184

+	)

185

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

186

     else

187

 	echo Would now upload "$@"

188

 	ls -l $@

189

190

diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf

191

index b19de76f..dced8eec 100644

192

--- a/tools/catalyst-auto-qemu-riscv.conf

193

+++ b/tools/catalyst-auto-qemu-riscv.conf

194

@@ -52,7 +52,10 @@ upload() {

195

 		-o VerifyHostKeyDNS=yes

196

 		-o StrictHostKeyChecking=no

197

)

198

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

199

+	local RSYNC_OPTS=(

200

+		-e "${SSH_CMD[*]}"

201

+	)

202

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

203

fi

204

}

205

206

207

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf

208

index 5716702c..d8a39286 100644

209

--- a/tools/catalyst-auto-s390.conf

210

+++ b/tools/catalyst-auto-s390.conf

211

@@ -35,7 +35,10 @@ upload() {

212

 		-o VerifyHostKeyDNS=yes

213

 		-o StrictHostKeyChecking=no

214

)

215

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

216

+	local RSYNC_OPTS=(

217

+		-e "${SSH_CMD[*]}"

218

+	)

219

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

220

}

221

222

 post_build() {

223

224

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf

225

index 3b4fd21c..e8a509d5 100644

226

--- a/tools/catalyst-auto-s390x.conf

227

+++ b/tools/catalyst-auto-s390x.conf

228

@@ -35,7 +35,10 @@ upload() {

229

 		-o VerifyHostKeyDNS=yes

230

 		-o StrictHostKeyChecking=no

231

)

232

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

233

+	local RSYNC_OPTS=(

234

+		-e "${SSH_CMD[*]}"

235

+	)

236

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

237

}

238

239

 post_build() {

240

241

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf

242

index bc441b2d..9cfbdcd5 100644

243

--- a/tools/catalyst-auto-sparc64.conf

244

+++ b/tools/catalyst-auto-sparc64.conf

245

@@ -37,7 +37,10 @@ upload() {

246

 		-o VerifyHostKeyDNS=yes

247

 		-o StrictHostKeyChecking=no

248

)

249

-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

250

+	local RSYNC_OPTS=(

251

+		-e "${SSH_CMD[*]}"

252

+	)

253

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

254

}

255

256

 post_build() {

257

258

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf

259

index ef983969..1c809465 100644

260

--- a/tools/catalyst-auto-x86.conf

261

+++ b/tools/catalyst-auto-x86.conf

262

@@ -61,13 +61,13 @@ upload() {

263

 		-o VerifyHostKeyDNS=yes

264

 		-o StrictHostKeyChecking=no

265

)

266

-	rsync \

267

-	-e "${SSH_CMD[*]}" \

268

-	-a \

269

-	--omit-dir-times \

270

-	--delay-updates \

271

-	"$@" \

272

-	"${UPLOAD_DEST}"

273

+	local RSYNC_OPTS=(

274

+		-e "${SSH_CMD[*]}"

275

+		--archive

276

+		--omit-dir-times

277

+		--delay-updates

278

+	)

279

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}

280

}

281

282

 post_build() {

1	commit: 4de1432aa1494b7c2459bb7fa740234a6777eac5
2	Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jan 31 00:39:55 2021 +0000
4	Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5	CommitDate: Sun Jan 31 01:56:43 2021 +0000
6	URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a
7
8	tools: Add RSYNC_OPTS array
9
10	Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12	tools/catalyst-auto-alpha.conf \| 5 ++++-
13	tools/catalyst-auto-amd64.conf \| 14 +++++++-------
14	tools/catalyst-auto-arm.conf \| 5 ++++-
15	tools/catalyst-auto-arm64.conf \| 5 ++++-
16	tools/catalyst-auto-hppa.conf \| 5 ++++-
17	tools/catalyst-auto-ia64.conf \| 5 ++++-
18	tools/catalyst-auto-ppc.conf \| 5 ++++-
19	tools/catalyst-auto-ppc64le.conf \| 5 ++++-
20	tools/catalyst-auto-qemu-arm.conf \| 5 ++++-
21	tools/catalyst-auto-qemu-riscv.conf \| 5 ++++-
22	tools/catalyst-auto-s390.conf \| 5 ++++-
23	tools/catalyst-auto-s390x.conf \| 5 ++++-
24	tools/catalyst-auto-sparc64.conf \| 5 ++++-
25	tools/catalyst-auto-x86.conf \| 14 +++++++-------
26	14 files changed, 62 insertions(+), 26 deletions(-)
27
28	diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
29	index ebaff6eb..381171b5 100644
30	--- a/tools/catalyst-auto-alpha.conf
31	+++ b/tools/catalyst-auto-alpha.conf
32	@@ -42,7 +42,10 @@ upload() {
33	-o VerifyHostKeyDNS=yes
34	-o StrictHostKeyChecking=no
35	)
36	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
37	+ local RSYNC_OPTS=(
38	+ -e "${SSH_CMD[*]}"
39	+ )
40	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
41	}
42
43	post_build() {
44
45	diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
46	index 0ef11f2f..363c80cb 100644
47	--- a/tools/catalyst-auto-amd64.conf
48	+++ b/tools/catalyst-auto-amd64.conf
49	@@ -74,13 +74,13 @@ upload() {
50	-o VerifyHostKeyDNS=yes
51	-o StrictHostKeyChecking=no
52	)
53	- rsync \
54	- -e "${SSH_CMD[*]}" \
55	- -a \
56	- --omit-dir-times \
57	- --delay-updates \
58	- "$@" \
59	- "${UPLOAD_DEST}"
60	+ local RSYNC_OPTS=(
61	+ -e "${SSH_CMD[*]}"
62	+ --archive
63	+ --omit-dir-times
64	+ --delay-updates
65	+ )
66	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
67	}
68
69	post_build() {
70
71	diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
72	index 26fe8156..eaae0399 100644
73	--- a/tools/catalyst-auto-arm.conf
74	+++ b/tools/catalyst-auto-arm.conf
75	@@ -64,7 +64,10 @@ upload() {
76	-o VerifyHostKeyDNS=yes
77	-o StrictHostKeyChecking=no
78	)
79	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
80	+ local RSYNC_OPTS=(
81	+ -e "${SSH_CMD[*]}"
82	+ )
83	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
84	else
85	echo Would now upload "$@"
86	ls -l $@
87
88	diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
89	index 9f457989..1bd94ae9 100644
90	--- a/tools/catalyst-auto-arm64.conf
91	+++ b/tools/catalyst-auto-arm64.conf
92	@@ -36,7 +36,10 @@ upload() {
93	-o VerifyHostKeyDNS=yes
94	-o StrictHostKeyChecking=no
95	)
96	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
97	+ local RSYNC_OPTS=(
98	+ -e "${SSH_CMD[*]}"
99	+ )
100	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
101	}
102
103	post_build() {
104
105	diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
106	index 8b465421..3b93e4ec 100644
107	--- a/tools/catalyst-auto-hppa.conf
108	+++ b/tools/catalyst-auto-hppa.conf
109	@@ -42,7 +42,10 @@ upload() {
110	-o VerifyHostKeyDNS=yes
111	-o StrictHostKeyChecking=no
112	)
113	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
114	+ local RSYNC_OPTS=(
115	+ -e "${SSH_CMD[*]}"
116	+ )
117	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
118	}
119
120	post_build() {
121
122	diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
123	index 6c78c8a7..2d87a837 100644
124	--- a/tools/catalyst-auto-ia64.conf
125	+++ b/tools/catalyst-auto-ia64.conf
126	@@ -35,7 +35,10 @@ upload() {
127	-o VerifyHostKeyDNS=yes
128	-o StrictHostKeyChecking=no
129	)
130	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
131	+ local RSYNC_OPTS=(
132	+ -e "${SSH_CMD[*]}"
133	+ )
134	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
135	}
136
137	post_build() {
138
139	diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
140	index a1286726..615c3f55 100644
141	--- a/tools/catalyst-auto-ppc.conf
142	+++ b/tools/catalyst-auto-ppc.conf
143	@@ -41,7 +41,10 @@ upload() {
144	-o VerifyHostKeyDNS=yes
145	-o StrictHostKeyChecking=no
146	)
147	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
148	+ local RSYNC_OPTS=(
149	+ -e "${SSH_CMD[*]}"
150	+ )
151	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
152	}
153
154	post_build() {
155
156	diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
157	index 0d54fab9..e2394932 100644
158	--- a/tools/catalyst-auto-ppc64le.conf
159	+++ b/tools/catalyst-auto-ppc64le.conf
160	@@ -42,7 +42,10 @@ upload() {
161	-o VerifyHostKeyDNS=yes
162	-o StrictHostKeyChecking=no
163	)
164	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
165	+ local RSYNC_OPTS=(
166	+ -e "${SSH_CMD[*]}"
167	+ )
168	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
169	}
170
171	post_build() {
172
173	diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
174	index 1a121997..e6075ec3 100644
175	--- a/tools/catalyst-auto-qemu-arm.conf
176	+++ b/tools/catalyst-auto-qemu-arm.conf
177	@@ -65,7 +65,10 @@ upload() {
178	-o VerifyHostKeyDNS=yes
179	-o StrictHostKeyChecking=no
180	)
181	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
182	+ local RSYNC_OPTS=(
183	+ -e "${SSH_CMD[*]}"
184	+ )
185	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
186	else
187	echo Would now upload "$@"
188	ls -l $@
189
190	diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
191	index b19de76f..dced8eec 100644
192	--- a/tools/catalyst-auto-qemu-riscv.conf
193	+++ b/tools/catalyst-auto-qemu-riscv.conf
194	@@ -52,7 +52,10 @@ upload() {
195	-o VerifyHostKeyDNS=yes
196	-o StrictHostKeyChecking=no
197	)
198	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
199	+ local RSYNC_OPTS=(
200	+ -e "${SSH_CMD[*]}"
201	+ )
202	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
203	fi
204	}
205
206
207	diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
208	index 5716702c..d8a39286 100644
209	--- a/tools/catalyst-auto-s390.conf
210	+++ b/tools/catalyst-auto-s390.conf
211	@@ -35,7 +35,10 @@ upload() {
212	-o VerifyHostKeyDNS=yes
213	-o StrictHostKeyChecking=no
214	)
215	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
216	+ local RSYNC_OPTS=(
217	+ -e "${SSH_CMD[*]}"
218	+ )
219	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
220	}
221
222	post_build() {
223
224	diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
225	index 3b4fd21c..e8a509d5 100644
226	--- a/tools/catalyst-auto-s390x.conf
227	+++ b/tools/catalyst-auto-s390x.conf
228	@@ -35,7 +35,10 @@ upload() {
229	-o VerifyHostKeyDNS=yes
230	-o StrictHostKeyChecking=no
231	)
232	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
233	+ local RSYNC_OPTS=(
234	+ -e "${SSH_CMD[*]}"
235	+ )
236	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
237	}
238
239	post_build() {
240
241	diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
242	index bc441b2d..9cfbdcd5 100644
243	--- a/tools/catalyst-auto-sparc64.conf
244	+++ b/tools/catalyst-auto-sparc64.conf
245	@@ -37,7 +37,10 @@ upload() {
246	-o VerifyHostKeyDNS=yes
247	-o StrictHostKeyChecking=no
248	)
249	- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
250	+ local RSYNC_OPTS=(
251	+ -e "${SSH_CMD[*]}"
252	+ )
253	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
254	}
255
256	post_build() {
257
258	diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
259	index ef983969..1c809465 100644
260	--- a/tools/catalyst-auto-x86.conf
261	+++ b/tools/catalyst-auto-x86.conf
262	@@ -61,13 +61,13 @@ upload() {
263	-o VerifyHostKeyDNS=yes
264	-o StrictHostKeyChecking=no
265	)
266	- rsync \
267	- -e "${SSH_CMD[*]}" \
268	- -a \
269	- --omit-dir-times \
270	- --delay-updates \
271	- "$@" \
272	- "${UPLOAD_DEST}"
273	+ local RSYNC_OPTS=(
274	+ -e "${SSH_CMD[*]}"
275	+ --archive
276	+ --omit-dir-times
277	+ --delay-updates
278	+ )
279	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
280	}
281
282	post_build() {

Gentoo Archives: gentoo-commits