Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Tue, 03 Feb 2015 21:39:29
Message-Id: 1422999547.c96c0540abf25e14d865ab9fcfd22b3e5748c901.dolsen@gentoo
1 commit: c96c0540abf25e14d865ab9fcfd22b3e5748c901
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 3 21:39:07 2015 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 3 21:39:07 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c96c0540
7
8 bin/emerge-webrsync: Fix my flawed logic for the rsync/websync check
9
10 Thanks to Zac for spotting my logic error.
11
12 ---
13 bin/emerge-webrsync | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
17 index e2b4e00..a603280 100755
18 --- a/bin/emerge-webrsync
19 +++ b/bin/emerge-webrsync
20 @@ -501,7 +501,7 @@ main() {
21
22 # This is a sanity check to help prevent people like funtoo users
23 # from accidentally wiping out their git tree.
24 - if [[ -n ${repo_sync_type} && ( ${repo_sync_type} != rsync || ${repo_sync_type} != websync ) ]] ; then
25 + if [[ -n ${repo_sync_type} && ${repo_sync_type} != rsync && ${repo_sync_type} != websync ]] ; then
26 echo "The current sync-type attribute of repository 'gentoo' is not set to 'rsync' or 'websync':" >&2
27 echo >&2
28 echo " sync-type=${repo_sync_type}" >&2