1 |
On Thu, 4 Sep 2014 08:38:29 +0200 |
2 |
Michał Górny <mgorny@g.o> wrote: |
3 |
|
4 |
> Dnia 2014-09-03, o godz. 18:22:15 |
5 |
> Brian Dolbec <dolsen@g.o> napisał(a): |
6 |
> |
7 |
|
8 |
> > fixed: bracket spacing (spotted by mrueg) |
9 |
> > |
10 |
> > diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
11 |
> > index 2f0689c..43f92b6 100755 |
12 |
> > --- a/bin/emerge-webrsync |
13 |
> > +++ b/bin/emerge-webrsync |
14 |
> > @@ -501,8 +501,8 @@ main() { |
15 |
> > |
16 |
> > # This is a sanity check to help prevent people like funtoo |
17 |
> > users # from accidentally wiping out their git tree. |
18 |
> > - if [[ -n ${repo_sync_type} && ${repo_sync_type} != rsync |
19 |
> > ]] ;then |
20 |
> > - echo "The current sync-type attribute of |
21 |
> > repository 'gentoo' is not set to 'rsync':" >&2 |
22 |
> > + if [ [ -n ${repo_sync_type} ] && [ ${repo_sync_type} != |
23 |
> > rsync -o ${repo_sync_type} != websync ] ] ; then |
24 |
> > + echo "The current sync-type attribute of |
25 |
> > repository 'gentoo' is not set to 'rsync' or 'websync':" >&2 echo |
26 |
> > >&2 |
27 |
> |
28 |
> I don't know what magic this is but you definitely want the old |
29 |
> |
30 |
> [[ -n ${repo_sync_type} && ${repo_sync_type} != rsync ]] |
31 |
> |
32 |
> with no extra brackets. |
33 |
> |
34 |
|
35 |
Looks like some line wrap might be confusing it. There was an added |
36 |
test (condition 2b)in the second half, so needed an extra set of brackets. |
37 |
|
38 |
if your client wraps this, read it as one line please. |
39 |
|
40 |
if [[ -n ${repo_sync_type} ] && [ ${repo_sync_type} != rsync -o ${repo_sync_type} != websync ]] ; then |
41 |
|
42 |
condition 1 ^^^ condition 2a ^^^ condition 2b ^^^ |
43 |
|
44 |
if it still isn't correct, please reply with it corrected... |
45 |
much appreciated :) |
46 |
|
47 |
-- |
48 |
Brian Dolbec <dolsen> |