1 |
On Wed, 3 Sep 2014 17:35:40 -0700 |
2 |
Brian Dolbec <dolsen@g.o> wrote: |
3 |
|
4 |
> |
5 |
> Most of you know about the plugin-sync branch of our portage.git repo. |
6 |
> I believe it is ready for review and merge into master to become the |
7 |
> new sync code for the future. |
8 |
> |
9 |
> Rather than follow this with 49 patch mails ... I produced a final git |
10 |
> diff of all the changes. I have cleaned up and squashed the original |
11 |
> commits to a point I do not want to squash further. This will keep |
12 |
> enough development history for important changes for future |
13 |
> troubleshooting if it is needed. Instead of inlining this diff like |
14 |
> most people prefer, I have attached it. It is 4.4K+ lines long. |
15 |
> Probably too long for many email clients. Plus opeing it in an editor |
16 |
> will allow the editors syntax highlighting to make code review easier. |
17 |
> |
18 |
> I have fully rebased the code on the current master (commit |
19 |
> 582cb806f88 QA patch) and pushed it to both our gentoo repo and our |
20 |
> github gentoo/portage repo. For those that wish to review it using |
21 |
> githubs interface. You have that option too. |
22 |
> |
23 |
> Thank you to all those that contributed to the code and testing. |
24 |
|
25 |
fixed: bracket spacing (spotted by mrueg) |
26 |
|
27 |
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
28 |
index 2f0689c..43f92b6 100755 |
29 |
--- a/bin/emerge-webrsync |
30 |
+++ b/bin/emerge-webrsync |
31 |
@@ -501,8 +501,8 @@ main() { |
32 |
|
33 |
# This is a sanity check to help prevent people like funtoo |
34 |
users # from accidentally wiping out their git tree. |
35 |
- if [[ -n ${repo_sync_type} && ${repo_sync_type} != rsync ]] ;then |
36 |
- echo "The current sync-type attribute of repository 'gentoo' is not set to 'rsync':" >&2 |
37 |
+ if [ [ -n ${repo_sync_type} ] && [ ${repo_sync_type} != rsync |
38 |
-o ${repo_sync_type} != websync ] ] ; then |
39 |
+ echo "The current sync-type attribute of repository 'gentoo' is not set to 'rsync' or 'websync':" >&2 echo >&2 |
40 |
-- |
41 |
Brian Dolbec <dolsen> |