Re: master broken

For starters I just pushed a branch called whitespace to upstream (diffstat follows) to make pylint happy. It also converts some files to UNIX EOF as well, please feel free to merge it to master it you think it's appropriate. ~/Projects/fedoraproject/func(master)] git diff whitespace --stat func/minion/AuthedXMLRPCServer.py | 2 +- func/minion/modules/delegation.py | 2 +- func/minion/modules/func_module.py | 2 +- func/minion/modules/getfile.py | 1 + func/minion/modules/nagios_check.py | 6 +- func/minion/modules/portinfo.py | 16 +-- func/minion/modules/users.py | 2 +- func/minion/modules/yumcmd.py | 4 +- func/minion/server.py | 8 +- func/module_loader.py | 4 +- func/overlord/client.py | 26 ++--- func/overlord/delegation_tools.py | 6 +- func/overlord/modules/getfile.py | 18 ++-- func/utils.py | 6 +- func/yaml/__init__.py | 46 ++++---- func/yaml/dump.py | 607 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- func/yaml/implicit.py | 103 +++++++++--------- func/yaml/inline.py | 87 +++++++-------- func/yaml/klass.py | 108 +++++++++---------- func/yaml/load.py | 665 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- func/yaml/stream.py | 398 ++++++++++++++++++++++++++++++++++---------------------------------- func/yaml/ypath.py | 938 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- 22 files changed, 1531 insertions(+), 1524 deletions(-) On Fri, Feb 8, 2013 at 3:03 PM, S.Çağlar Onur <caglar(a)10ur.org&gt; wrote: > Hey Steve, > > Thanks for quick response :) I'll give it a try and will let you know if > anything comes up. > > Cheers, > > > On Fri, Feb 8, 2013 at 2:59 PM, Steve Salevan <steve(a)tumblr.com&gt; wrote: > >> Most of these were changes which were intentionally merged in as part of >> the ixs-delegation merge, which was outstanding for some time and contained >> some useful bugfixes and improvements to the delegation codebase, >> particularly around delegation path determination and parallelization >> during delegation calls. Reviewing the diff you supplied, it appears that >> most of the code in it covered these changes; however, testsingle.py is >> definitely some old code and came back, like a zombie, with this merge, so >> I've removed it from master. >> >> At the moment, it looks as if we're back to a happy state; thanks much >> for your vigilance, be sure to let me know if you see anything else that >> looks strange. >> >> On Fri, Feb 8, 2013 at 1:41 PM, S.Çağlar Onur <caglar(a)10ur.org&gt; wrote: >> >>> Hmm it still looks like there are some artifacts in the repo. My local >>> copy was at 4cce9c5b796a0f1f2205deb391b088d7a3e066b6 before the merge and >>> now it shows following diff >>> >>> [caglar@kokai:~/Projects/fedoraproject/func(master)] git diff >>> 4cce9c5b796a0f1f2205deb391b088d7a3e066b6 | diffstat >>> minion/AuthedXMLRPCServer.py | 2 >>> minion/modules/delegation.py | 47 ++++++++----- >>> minion/modules/func_module.py | 2 >>> minion/modules/testsingle.py | 147 >>> ++++++++++++++++++++++++++++++++++++++++++ >>> overlord/client.py | 39 ++++++----- >>> overlord/cmd_modules/call.py | 2 >>> overlord/delegation_tools.py | 32 +++++---- >>> overlord/mapper.py | 10 ++ >>> overlord/sslclient.py | 2 >>> utils.py | 2 >>> yaml/implicit.py | 5 + >>> 11 files changed, 237 insertions(+), 53 deletions(-) >>> >>> I'm not %100 sure those are the things we want in the master. >>> >>> >>> On Fri, Feb 8, 2013 at 1:14 PM, Steve Salevan <steve(a)tumblr.com&gt; wrote: >>> >>>> Hey man, >>>> Thanks hugely for discovering this; I have corrected the merge >>>> conflict and pushed a commit up to master to unbreak Func. >>>> >>>> On Fri, Feb 8, 2013 at 12:55 PM, S.Çağlar Onur <caglar(a)10ur.org&gt;wrote: >>>> >>>>> Steve, >>>>> >>>>> It looks like you accidentally merged an old branch (xs-delegation<http://git.fedorahosted.org/cgit/func.git/commit/>) into >>>>> master [1] and it made things bad as commit contains non python code. >>>>> >>>>> [1] >>>>> http://git.fedorahosted.org/cgit/func.git/commit/?id=9a0ae4446ff1b9ad7bcc... >>>>> >>>>> Cheers, >>>>> -- >>>>> S.Çağlar Onur <caglar(a)10ur.org&gt; >>>>> >>>>> _______________________________________________ >>>>> func mailing list >>>>> func(a)lists.fedorahosted.org >>>>> https://lists.fedorahosted.org/mailman/listinfo/func >>>>> >>>> -- >>>> Steve Salevan >>>> steve(a)tumblr.com >>>> >>>> _______________________________________________ >>>> func mailing list >>>> func(a)lists.fedorahosted.org >>>> https://lists.fedorahosted.org/mailman/listinfo/func >>>> >>>> >>> >>> >>> -- >>> S.Çağlar Onur <caglar(a)10ur.org&gt; >>> >>> _______________________________________________ >>> func mailing list >>> func(a)lists.fedorahosted.org >>> https://lists.fedorahosted.org/mailman/listinfo/func >>> >>> >> -- >> Steve Salevan >> steve(a)tumblr.com >> >> _______________________________________________ >> func mailing list >> func(a)lists.fedorahosted.org >> https://lists.fedorahosted.org/mailman/listinfo/func >> >> > > > -- > S.Çağlar Onur <caglar(a)10ur.org&gt; > -- S.Çağlar Onur <caglar(a)10ur.org&gt; _______________________________________________ func mailing list func(a)lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/func