error: Untracked working tree file 'carton.lock' would be overwritten by merge.
huh?
kepstin
sounds like someone accidentally checked in carton.lock :/
warp
navap: carton.lock is automatically generated by Carton, but it is also part of our git repository.
kepstin: no, intentionally! that has the exact versions we want, so it should be checked in.
navap: you can safely remove it.
navap
What happens when we do local installs?
warp
local installs?
navap
I installed XML::Feed with carton earlier today because I checkouted a really old branch that required that
I presume that's when the carton.lock was created
warp
navap: with "carton install XML::Feed" ?
navap
Yes
I was following the instructions in the ~/README
warp
navap: that's fine, that shouldn't cause problems.
carton has an uninstall command, which is slow but should work in theory. and otherwise it's easy to start over.
but a few extra packages shouldn't have any effect on the server.
navap
So it seems a recent commit to master is what's causing my collate issues. If I checkout a branch from a few days ago on xpc I don't get collate problems, I do when I checkout master though
But interestingly both master and the other branch work fine on rika
warp
it may be related to where it is looking for extensions.
I know we changed where the cube extension gets installed (in the public schema instead of the musicbrainz schema)
which also means we changed the postgresql search path (which is used to find extensions, among other things)
so perhaps musicbrainz_collate is in public on rika, and older branches don't have public in the search path
and the other way around on your server.
ocharles made those changes, so he should be able to tell you the details.
navap
uh, what the hell! master works on rika, fails on xpc. bootstrap fails on rika, works on xpc.
warp
navap: exactly what I was describing :)
navap
But, but, it was partially working 5 min ago!
warp
haha
navap gets frustrated when he gets errors he didn't cause and can't fix :(
the easy fix (if you're patient) is to do delete the database and do a fresh import of fullexport while you're on the master branch.
navap
That would be on xpc, the older server right?
warp
yes
navap
That's easy enough, I've only got the test db on there
warp
on rika you should be able to run the bootstrap branch by just merging master into it (git merge --log --no-ff master)
navap
heh, turns out you can't drop a db that has active sessions to it. That's a good thing :)
psql: FATAL: database "musicbrainz_db" does not exist
Ah, the extra --
I copied the line from the INSTALL which says carton exec ./admin/InitDb.pl -- --createdb --clean
I imagine carton needs the extra --?
kepstin
yeah, that separates carton options from options that it passes through to the program it runs
warp runs off
warp
goodnight!
ianmcorvidae
warp: merge in master, as I recall -- nikki was having that trouble
navap
warp: Thanks! Both rika and xpc are fixed for me
ianmcorvidae
re: collate
ah, it says that in the log
cool :)
dukeleto joined the channel
Leftmost joined the channel
ruaok joined the channel
reosarevok joined the channel
ijabz joined the channel
ijabz joined the channel
ijabz joined the channel
the_metalgamer joined the channel
ijabz joined the channel
ruaok joined the channel
Leftmost joined the channel
ruaok joined the channel
ijabz joined the channel
Leftmost joined the channel
ijabz joined the channel
ijabz joined the channel
ocharles
navap, kepstin: is there any reason you're doing pull requests, and not going through the official process of submitting patches?
navap
I figured the best way to test out github's review system was to actually do a pull request. I have no problem submiting the patch to review board though.
ocharles
i would still prefer that, yea. I was hoping to use the cover art stuff to test reviews
but I guess that doesn't have as many collaborators
we should probably test github reviews if after the discussion it even looks like people want that
reosarevok joined the channel
reosarevok_ joined the channel
navap
ocharles: How do you suggest we fix the robots.txt rewriting? Is that something I could do?
reosarevok joined the channel
ocharles
navap: I was looking at that, but haven't quite got a solution yet
reosarevok_ joined the channel
I'm thinking of having root/robots.txt disallow everything, and then having a set of features conf files, and one will rewrite /robots.txt into /robots-production.txt or something