[00:23] alright, not so bad once I got into it [00:24] * SpamapS pushes fix for SSL cert verification into juju [00:43] SpamapS, woot! [00:43] SpamapS, meld is your friend on the nasty merges [00:43] i typically invoke via bzr qconflicts [00:43] hazmat: none of it was really nasty actually. We both just legitimately changed the same path in a lot of places, but luckily it never got that ugly [00:44] most of it was that get_current_ami changed to something much more elegant.. [00:44] and what I did was very non-intrusive.. [00:44] hazmat: oo, never used that [00:44] hazmat: know any good tools for analyzing aggregate code stats for python? [00:45] I am putting together a little retrospective for the evolution of the juju codebase over the last 6 months. [00:47] SpamapS, you mean want LOC over time? [00:47] * hazmat gives up on english [00:47] LOC and maybe test coverage though I know I have to actually *run* the tests to do that [00:49] hazmat: I can find a lot of tools to do per-file stats [00:49] but I just want to point at a dir and get some interesting numbers [00:49] SpamapS, nothing python specific comes to mind for that.. you could try just pushing it to ohloh [00:50] oooo [00:50] yeah that might work :) [00:51] argh.. yet another site to login to [00:54] SpamapS, else.. scripting http://cloc.sourceforge.net/ with bzr -u revno [00:56] hazmat: 96 test coverage... not too shabby [00:57] 96% I should say [00:57] ahh and the worst file is juju/lib/lxc/__init__ .. which would be better if I had not skipped those tests :) [00:59] yeah.. we dropped 2% since last release [00:59] sloppy ;-) [01:01] I got really weird errors when running coverage tests [01:01] exceptions.IOError: /usr/lib/python2.7/dist-packages/ubuntuone-storage-protocol/juju/hooks/tests/hooks/success-hook doesn't exist [01:03] huh [01:03] odd path [01:03] SpamapS, via make coverage? [01:05] https://www.ohloh.net/p/juju [01:05] hazmat: yeah [01:07] SpamapS, haven't seen that one before [01:08] Step 2 of 3: Importing source code into database (Running 0/1) [01:08] *get on with it!* ;) [01:11] bcsaller, the latest lbox diff looks off [01:11] when doesn't it [01:11] I'll take a look [01:11] ic some of the changes that jimbaker made in that diff that are on trunk [01:12] hazmat: which branch are you looking at? [01:12] https://codereview.appspot.com/5892046/ [01:12] bcsaller, the pre-req needs to have trunk merged [01:14] lp gets the diff wrong as well.. say its 7k [01:15] bcsaller, might be easiest to just remove the pre-requiste on the mp and run lbox again [01:15] but getting the pre-req merged to current trunk should also work [01:16] * hazmat is tired [01:16] beer o'clock back in a bit [02:19] bcsaller, can you run lbox again [02:20] hazmat: I had, you think it will be different if I do it again? [02:20] bcsaller, i modified the mp [02:20] just now [02:20] ahh, ok, running it now, for both [02:21] bcsaller both? [02:21] bcsaller, btw the problem b4, was you had to push the pre-req branch to lp after merging trunk [02:21] lbox pulls there for the pre-req [02:21] https://codereview.appspot.com/5892046 and https://codereview.appspot.com/5991079 [02:22] though the later includes the former [02:22] merging it locally doesn't do anything by itself [02:22] I proposed both before as well [02:33] bcsaller, the status branch which is the pre-req for agent wasn't pushed [02:33] with a trunk merge [02:33] * hazmat calls it a night [02:33] I thought that was merged [02:33] maybe it didn't detect that [02:40] I think the problem is the pre-req stays around even after merge and it shouldn't when the merge is with the lbox propose -for target [07:55] mornin' all [07:57] wrtp: morning [08:16] morning wrtp, TheMue [08:16] heya fwereade_ [08:16] fwereade_, TheMue: hiya. hope you've had a good time over Easter. [08:17] wrtp, lovely, thanks; and yourself? [08:17] fwereade_: just great. we even had *some* nice weather at the start (the rest was a bit shit tbh) [08:18] wrtp, cool [08:18] wrtp, I forget, what was it you were doing [08:18] ? [08:19] fwereade_: went up north, to skye (where my folks live) via the ardnamurchan pensinsula with our bikes. [08:22] fwereade_: so shitty weather is par for the course [08:22] wrtp: ah, skye, home of good malts [08:23] TheMue: only one malt really :-) [08:23] wrtp, indeed, but I must say that I've always found bikes to be an unpleasantness multiplier for shitty weather [08:23] TheMue: distilled about 3 miles from where my parents live... [08:23] fwereade_: luckily we had the good weather at the start when we were on the bikes [08:24] wrtp, perfect :) [08:26] fwereade_: here was a photo i took on my phone about half way through the longest day trip. we'd just come along the coast (mostly walking as our mountain bike skillz are not sufficiently l33t): https://www.facebook.com/photo.php?fbid=10150779643720903&set=a.445021760902.235579.754250902&type=3&theater [08:27] wrtp, that's lovely === TheMue_ is now known as TheMue [08:28] wrtp, oddly reminiscent of a nice bay in gozo [08:28] fwereade_: pity about the shitty fb photo resolution. you can see the snow shower that hit us if you look vertically above the wee house. [08:29] a good mixed day [08:29] wrtp, that ever-so-slight fuzziness? [08:29] fwereade_: xactly [08:29] fwereade_: sun and blizzards, what more could we ask for?! [08:30] wrtp, sounds pretty awesome to me :) [08:30] wrtp: wonderful photo. and did you brought a fine Talisker with you [08:30] TheMue: of course! [08:31] wrtp: (envy) ;) [08:32] wrtp: i had the hope that my highland park 30yo will be here before easter. but it's so rare that i have to wait until mid of may. (sigh) [08:43] fwereade_: here's the bike route we did that day, excepting the bit that google maps doesn't know about. we started from Acharacle and went anti-clockwise. http://g.co/maps/wup3q [08:44] i love the fact that the google van went down all the tiny little roads around there (not all the tracks though, sadly :-)) [12:31] Good morning [12:31] niemeyer: yo! [12:31] niemeyer: hope you had a good Easter... [12:33] wrtp: Heya! Welcome back [12:33] wrtp: Yeah, pretty good stuff [12:34] wrtp: Although I've just been notified that the blog has been hacked again.. :( [12:34] It's time to drop wordpress.. [12:34] which blog? [12:39] wrtp: blog.labix.org [12:43] niemeyer: oops. i'd better check mine. [12:43] niemeyer: morning [12:43] It's time to drop wordpress.. [12:43] TheMue: Heya! [13:12] aaaaaaargh! f*ck, watching the right node during tests definitely helps :D [13:29] morning [15:10] Lunch time.. biab === asavu_ is now known as asavu [17:32] bcsaller1, it looks like the problems are the same bzr circular merge that was here before.. [17:33] bcsaller1, ignoring reitveld's diff.. the actual diff to trunk is borked [17:33] hazmat: thats is not what I thought the issue was, but I'm looking at it again [17:37] hazmat: my diff to trunk looked ok, what are you seeing? [17:38] bcsaller1, the lp diff [17:39] bcsaller1, diffing manually to trunk produces a sane result [17:40] yeah, thats was I was seeing === bcsaller1 is now known as bcsaller [17:41] hmm.. actually not.. [17:41] test_service diff is odd [17:42] bcsaller, UnsupportedSuborinateServiceRemoval [17:42] missing a 'd' [17:42] ha [17:42] and the doc string for the same has a typo [17:42] type once, expand everywhere :( [17:46] bcsaller, huh.. nevermind that actually is screwed on trunk re test_service.py [17:47] I think there was a whitespace issue, ran reindent.py on it when I saw that [17:47] not sure what happened though [17:49] bcsaller, looks like it was introduced in the merge of subordinate control [17:49] well, that should fix it [18:20] /me is off for the night. [18:20] :-) [18:20] see y'all tomorrow [18:47] bcsaller, review in [18:47] wrtp, cheers [18:47] hazmat: thank you