| maxb | After the next devel buildbot run, the stable->db-devel merger is going to hit a conflict | 00:27 |
|---|---|---|
| noodles775 | Hi all | 07:09 |
| wgrant | Morning. | 07:09 |
| adeuring | good morning | 08:13 |
| maxb | Hi, it's my belief that the stable->db-devel automerge is currently broken due to conflict, due to branches of mine | 08:31 |
| maxb | I have a resolved merge branch ready: https://code.launchpad.net/~maxb/launchpad/devel-10306-to-db-devel-resolve-conflict/+merge/19154 | 08:31 |
| noodles775 | maxb: thanks, get it sorted. | 09:03 |
| mrevell | G'Day | 09:04 |
| allenap | thekorn: Morning :) | 09:05 |
| thekorn | allenap, good morning | 09:05 |
| thekorn | allenap, I'm about to push a new doctest for person.searchtasks() | 09:05 |
| allenap | thekorn: Cool, I'll have a look in a bit. | 09:06 |
| thekorn | allenap, I'm using factories there to generate sample data, but I'm having a hard time using this non-static data in this doctest | 09:06 |
| allenap | thekorn: Often you have to do things like setting displayname to give something to match against. | 09:08 |
| noodles775 | maxb: sorry, i just re-read my message. Epic fail. s/get it sorted/I'll get it sorted. | 09:09 |
| thekorn | allenap, yes, this works fine for Persons, but I'm also generating two sample bugs, and I found no way to preset the bug id | 09:09 |
| thekorn | allenap, so I ended up with a comparing the bug_url, but you will find out about it ;) | 09:10 |
| thekorn | pushed it now, btw. | 09:10 |
| allenap | thekorn: Cool. | 09:10 |
| thekorn | I *think* I've adressed everything | 09:11 |
| * jml screws his courage to the sticking place and starts to work through the inbox | 09:29 | |
| allenap | thekorn: Looks good, ready to land :) One *tiny* thing. There's a lot of trailing white-space in the files you've touched. Can you clean this up, and perhaps set your editor to remove it automatically? If left it becomes a source of confusing diffs and conflicts; most/all of the LP team automatically remove white-space. | 09:32 |
| thekorn | allenap, argh, ok, I'm on it | 09:45 |
| allenap | mrevell: Did you want me to review this: https://code.edge.launchpad.net/~matthew.revell/launchpad/tags-help-484259/+merge/19114 ? | 10:00 |
| mrevell | allenap, I have a call with jml now. Could we have a quick call after that? I'm still concerned about the icon placement. | 10:01 |
| allenap | mrevell: Sure. | 10:01 |
| mrevell | thanks allenap | 10:01 |
| thekorn | allenap, I just pushe a fix for the whitespaces, but when running make lint I get alot of messages, even about parts that where not touched in this branch | 10:30 |
| === matsubara-afk is now known as matsubara | ||
| allenap | thekorn: Odd, I'll have a look. | 10:57 |
| thekorn | allenap, I think this messages need to be fixed in devel itself, in a separate branch. for example when I change lib/lp/registry/interfaces/person.py in current devel by adding a whitespace and then run make lint I get alot of messages | 11:03 |
| deryck | Morning, all. | 11:04 |
| allenap | thekorn: I think you merged db-devel in r10132 instead of devel. | 11:04 |
| allenap | thekorn: I think you're going to have to do a few uncommits to get back to that revision and revert it. I can't figure out how to revert it without mucking up history. | 11:08 |
| thekorn | allenap, damn | 11:09 |
| allenap | thekorn: You can probably save the diff of 10132..10134 and reapply it afterwards to save some time. | 11:10 |
| thekorn | allenap, the brnach I get with rockertfuel-get should be lp:launchpad and not lp:launchpad/devel, correct? | 11:12 |
| thekorn | somehow I messed thing up :( | 11:12 |
| allenap | thekorn: For me it's lp:launchpad/devel. | 11:12 |
| thekorn | allenap, I'm sorry, I 'll take care of it later today, or over the weekend, | 11:14 |
| thekorn | sorry for the inconvenience | 11:14 |
| allenap | thekorn: No worries. I can fix it up now if you want. | 11:14 |
| thekorn | allenap, It is up to you | 11:15 |
| thekorn | I've to run now | 11:15 |
| thekorn | have a good weekend | 11:15 |
| allenap | thekorn: Okay, I'll do it. You too :) | 11:15 |
| allenap | thekorn: Thanks for this branch; it's great, and I'll get it landed. | 11:15 |
| thekorn | super great | 11:15 |
| === salgado is now known as salgado-afk | ||
| === mrevell is now known as mrevell-lunch | ||
| === mrevell-lunch is now known as mrevell | ||
| === jml is now known as jml-afk | ||
| === jml-afk is now known as jml | ||
| gmb | Argh, can't we just grant * to * in the DB? | 14:07 |
| * gmb hates at database permissions | 14:07 | |
| gmb | Does anyone with a bigger brain than me know why a cronscript would run fine normally but, when run via `run_script` in a unit test would fail on db permissions? Is possible it's being run as some other db user even though it's running in a subprocess? | 14:38 |
| === jamalta is now known as jamalta-afk | ||
| === matsubara is now known as matsubara-lunch | ||
| === salgado-afk is now known as salgado | ||
| === pgquiles_ is now known as pgquiles | ||
| === salgado is now known as salgado-brb | ||
| === matsubara-lunch is now known as matsubara | ||
| === Ursinha is now known as Ursinha-food | ||
| bdmurray | This url seems to have a spelling error or two | 16:42 |
| bdmurray | https://help.launchpad.net/Bugs/BugAttchements | 16:42 |
| bdmurray | However, its linked to from bugs.launchpad.net as help regarding attachments. | 16:42 |
| bigjools | heh, mrevell ^^ | 16:50 |
| mrevell | thanks bdmurray, let me take a look at that | 16:50 |
| allenap | gmb: You might know this. If I get ComponentLookupError: (<...IPlacelessAuthUtility>, ''), what's happening, and how do I solve it? | 17:09 |
| === deryck is now known as deryck[lunch] | ||
| === GabydeWilde__ is now known as GabydeWilde_ | ||
| === gary_poster is now known as gary-lunch | ||
| bigjools | maxb: thank you thank you thank you for the hashlib cleanup | 17:47 |
| maxb | :-) | 17:47 |
| bigjools | in particular the soyuz crack to cope with hardy bustage | 17:48 |
| maxb | barry deserves a lot of the credit, but I finished off what was abandoned on the python-migration2.6 branch | 17:48 |
| bigjools | thank you barry then :) | 17:49 |
| mrevell | Night all | 17:56 |
| === deryck[lunch] is now known as deryck | ||
| === gary-lunch is now known as gary_poster | ||
| === Ursinha-food is now known as Ursinha | ||
| === salgado-brb is now known as salgado | ||
| === matsubara is now known as matsubara-afk | ||
| === NCommander_ is now known as NCommander | ||
| === NCommander is now known as Guest88140 | ||
| === Guest88140 is now known as NCommander | ||
| maxb | noodles775: You resolved my conflict wrong :-/ | 21:39 |
| noodles775 | maxb: er, I'm not sure how that's possible? I simply merged stable->db-devel, and the only conflict was this | 22:32 |
| === salgado is now known as salgado-afk | ||
| noodles775 | http://pastebin.ubuntu.com/375040/ | 22:32 |
| noodles775 | ie. an import which was no longer used in the file. | 22:32 |
| maxb | *blink* | 22:32 |
| maxb | When I did my merge, "import sets" was inside the conflict markers too | 22:33 |
| noodles775 | maxb: is it just the lint on the file then? Or is there a bigger problem? | 22:35 |
| maxb | Well, the objective of one of my earlier branches was to remove all imports of 'sets' from launchpad, since it raises DeprecationWarnings in python 2.6 | 22:36 |
| noodles775 | I see. Strange that it didn't appear in the conflict then. | 22:38 |
| noodles775 | Night. | 22:39 |
| noodles775 | maxb: Just checking out of interest, the stable revision that I merged has the sha removed, but not sets, so the diff makes sense?: http://pastebin.ubuntu.com/375050/ | 22:44 |
| noodles775 | That's stable r10312 | 22:45 |
| noodles775 | maxb: in fact, bzr diff -c 10306 lib/lp/services/mail/sendmail.py seems to show that the import of sets wasn't removed in that rev, but was *moved*. | 22:48 |
| maxb | Indeed, sets was removed in db-devel | 22:48 |
| maxb | This was because it happened to touch a couple of scripts in the schema dir :-/ | 22:48 |
| noodles775 | I see. | 22:49 |
| wgrant | The entirety of database/schema is blacklisted, not just the schema? | 22:50 |
| maxb | Apparently | 22:50 |
| noodles775 | maxb: I've approved the MP and have sent it to ec2. | 22:55 |
| maxb | Thanks | 22:55 |
| noodles775 | morning wgrant, and good night :) | 22:55 |
| noodles775 | np. | 22:56 |
| wgrant | Night noodles775. | 22:56 |
| lfaraone | How does one turn off devmode on Launchpad? | 22:58 |
| jelmer | lfaraone: What do you mean with devmode, the beta (edge) ? | 22:59 |
| wgrant | In your configuration's launchpad.conf, remove the 'devmode on' line. | 22:59 |
| lfaraone | jelmer: I meant for running LP locally. | 23:00 |
| lfaraone | wgrant: ah, mk. | 23:00 |
| wgrant | lfaraone: You know about the licensing restrictions? | 23:02 |
| lfaraone | wgrant: yes, I'm aware. | 23:02 |
| lfaraone | wgrant: I'm not intending to run this full-time, but rather as a demo that our project is capable of running Launchpad outside of launchpad.net if we ever have a reason to leave. I personally think the idea's silly, but I'm not on the board :) | 23:04 |
| wgrant | lfaraone: Oh, right, I remember your situation now. | 23:09 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!