| Time |
Nick |
Message |
| 02:01 |
|
sbrylander joined #evergreen |
| 06:33 |
|
wsmoak joined #evergreen |
| 07:18 |
|
jventuro joined #evergreen |
| 07:24 |
|
sarabee joined #evergreen |
| 07:52 |
|
rjackson-isl joined #evergreen |
| 07:53 |
csharp |
@later tell kmlussier bug 778989 is ready to go - just needs a committer |
| 07:53 |
pinesol_green |
csharp: The operation succeeded. |
| 07:53 |
|
kmlussier joined #evergreen |
| 07:59 |
|
jboyer-isl joined #evergreen |
| 08:03 |
kmlussier |
Good morning #evergreen. Happy Bug Squashing Day! |
| 08:04 |
kmlussier |
csharp: Thanks! I'll add a signedoff tag to help it get some attention. |
| 08:08 |
|
wsmoak joined #evergreen |
| 08:10 |
csharp |
kmlussier: much appreciated |
| 08:11 |
bshum |
kmlussier: csharp: hmm, should that get a release note added since it's more new feature? |
| 08:12 |
bshum |
Or am I misreading the bug note? |
| 08:17 |
|
graced joined #evergreen |
| 08:19 |
|
collum joined #evergreen |
| 08:23 |
kmlussier |
bshum: I could see it being a bug fix. |
| 08:23 |
csharp |
it's a bug if your workflow is like ours where items are cataloged centrally |
| 08:23 |
csharp |
otherwise, you'd never hit it (and never notice the "fix") |
| 08:24 |
* csharp |
is happy to work up any documentation that we deem necessary though ;-) |
| 08:24 |
bshum |
Fair enough, just checking. |
| 08:25 |
* bshum |
is always antsy when it comes to backporting SQL upgrades to older versions. |
| 08:28 |
|
mdriscoll joined #evergreen |
| 08:28 |
csharp |
bshum: fwiw, I tested in master and 2.5.1 when I signed off |
| 08:29 |
|
mrpeters joined #evergreen |
| 08:30 |
bshum |
csharp: For your addition, putting the DROP TRIGGER IF EXISTS in the base schema, do we need that in the base schema? I figure we don't need it when creating fresh DBs |
| 08:30 |
bshum |
Definitely handy for the upgrade script though |
| 08:32 |
mrpeters |
anyone have a moment to update my keys on file for bug squashing day today? |
| 08:34 |
bshum |
mrpeters: I would recommend sending an email off to the git admins. |
| 08:34 |
* bshum |
is not one of them. |
| 08:34 |
mrpeters |
yeah, can do, just thought id ping here in case someone was actively in there right now |
| 08:35 |
* bshum |
isn't sure what timezone gmcharlt is in now :) |
| 08:39 |
kmlussier |
I think he's back in Pacific time zone, but I'm guessing dbs and tsbere are in Eastern. :) |
| 08:39 |
|
mmorgan joined #evergreen |
| 08:39 |
bshum |
dbwells: I'm going to hand patch in the couple changes to fix the security bug problem into the tarball and upload a new tarball to lupin instead of re-running the whole release. I think I made a bit of a mess with putting 2.7.0-2.7.1 into rel_2_7 early. |
| 08:42 |
kmlussier |
bug 1183226 has a patch from paxed that needs to be rebased. Is that something somebody else could easily rebase since he doesn't work on Evergreen anymore? |
| 08:42 |
pinesol_green |
Launchpad bug 1183226 in Evergreen "Staff client "search by" drop down doesn't obey sort filter" (affected: 1, heat: 6) [Low,Triaged] https://launchpad.net/bugs/1183226 |
| 08:43 |
mrpeters |
I think I can do that. Let me get this master box updated |
| 08:43 |
kmlussier |
mrpeters++ #Thank you! |
| 08:45 |
mrpeters |
if you want to assign that to me, feel free...still waiting on my pw reminder email from launchpad |
| 08:45 |
mrpeters |
i may have to create a new account, i see they have switched to ubuntu one |
| 08:47 |
gmcharlt |
bshum: kmlussier: nope still in EST |
| 08:47 |
gmcharlt |
flying back to Seattle tomorrow |
| 08:50 |
|
Shae joined #evergreen |
| 08:58 |
kmlussier |
gmcharlt: I must have been confused by your most recent cat update on Twitter. I thought it was a sign that you were back on the west coast. :) |
| 08:58 |
* csharp |
helps squash bug 1203734 with a signoff |
| 08:58 |
pinesol_green |
Launchpad bug 1203734 in Evergreen 2.6 ""Last Few Circulations" total circulation count does not include aged circulations" (affected: 2, heat: 10) [Medium,Confirmed] https://launchpad.net/bugs/1203734 |
| 08:59 |
kmlussier |
csharp++ |
| 09:01 |
mmorgan |
csharp++ |
| 09:03 |
* kmlussier |
needs to change the process so that people assign themselves to bugs as soon as they request the Sandbox. |
| 09:04 |
bshum |
mrpeters: I just took a quick cursory glance at paxed's branch in bug 1183226 and I think that changes in ab373367 will make sorting out all the queryparser logic a bit more interesting when rebasing. |
| 09:04 |
pinesol_green |
Launchpad bug 1183226 in Evergreen "Staff client "search by" drop down doesn't obey sort filter" (affected: 1, heat: 6) [Low,Triaged] https://launchpad.net/bugs/1183226 - Assigned to Michael Peters (mrpeters) |
| 09:04 |
pinesol_green |
[evergreen|Mike Rylander] Have TPAC put user input at the end in all cases - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=ab37336> |
| 09:05 |
mrpeters |
ah, maybe that one is not good for me then |
| 09:05 |
bshum |
Queryparser stuff still weirds me out a bit, so I'm reading it more carefully to try and understand what's changing in search. |
| 09:05 |
bshum |
Someone else might want to take eyes to what paxed did and reconciling it with latest master. |
| 09:05 |
mrpeters |
yeah, i am not up to speed on queryparser at all |
| 09:09 |
kmlussier |
mrpeters: Thanks anyway for thinking about it! |
| 09:09 |
kmlussier |
Does anyone with more qp knowledge have an interest in rebasing bug 1183226? |
| 09:09 |
pinesol_green |
Launchpad bug 1183226 in Evergreen "Staff client "search by" drop down doesn't obey sort filter" (affected: 1, heat: 6) [Low,Triaged] https://launchpad.net/bugs/1183226 - Assigned to Michael Peters (mrpeters) |
| 09:11 |
|
TaraC joined #evergreen |
| 09:21 |
csharp |
argh - revisiting bug 1206936 means relearning window functions ;-) |
| 09:21 |
pinesol_green |
Launchpad bug 1206936 in Evergreen "money.transaction_billing_summary view displays incorrect billing_type and billing_note for the actual last transaction" (affected: 1, heat: 6) [Medium,Triaged] https://launchpad.net/bugs/1206936 |
| 09:21 |
csharp |
I definitely want to fully review my work before considering that done, though |
| 09:22 |
|
TheBob joined #evergreen |
| 09:24 |
dbs |
mrpeters: gitadmin is always the first step, then ping if necessary :) |
| 09:24 |
mrpeters |
fair enough |
| 09:24 |
* dbs |
is in EST - Eastern SNOWWWWWWWW Time |
| 09:24 |
mrpeters |
yuck |
| 09:24 |
mrpeters |
we have one more nice day today |
| 09:25 |
mrpeters |
then down to the 30s and snow/rain |
| 09:26 |
dbs |
well, we only had a dusting of snow this morning, but up to 15 cm / 6" tonight |
| 09:29 |
mrpeters |
:( dreading that! |
| 09:30 |
bshum |
I was just looking over wlayton's submissions for https://bugs.launchpad.net/opensrf/+bug/1272937 and where it is left is the fact that there's no m4 directory to put stuff into |
| 09:30 |
pinesol_green |
Launchpad bug 1272937 in OpenSRF "OpenSRF configure.am showing deprecation warnings with autoreconf -i step" (affected: 3, heat: 16) [Undecided,New] |
| 09:31 |
bshum |
With 14.04, the m4 directory is added magically by autoconf, but with 12.04 it just dies. |
| 09:31 |
bshum |
Reading around, I can see other people just include an m4 directory in the base directory to avoid stuff like this, but I'm not sure what that would mean for OpenSRF/Evergreen moving forward. |
| 09:31 |
bshum |
Or if we're doing something not quite optimally. |
| 09:32 |
bshum |
If we do add an m4 directory to the base, I figure we ought to add that sort of stuff to .gitignore |
| 09:32 |
bshum |
The other thing I wonder is whether this has impact for when we build the source tarballs later during releases. |
| 09:33 |
csharp |
not knowing autotools very well, that *feels* like a hack (adding the m4 directory) |
| 09:34 |
|
mllewellyn joined #evergreen |
| 09:35 |
mrpeters |
it is a "squash" csharp :) |
| 09:36 |
csharp |
heh |
| 09:36 |
|
yboston joined #evergreen |
| 09:36 |
bshum |
csharp: I think it may also have to do with what's specified in the changes. We might be able to specify a different place other than m4 to put the m4 macros |
| 09:41 |
csharp |
reading this thread: http://lists.gnu.org/archive/html/bug-automake/2013-01/msg00115.html - makes it look like the automake devs agree that it should be a warning, not a show-stopping error, but I don't see where/whether it was followed up on |
| 09:43 |
csharp |
ah: http://lists.gnu.org/archive/html/bug-automake/2013-02/msg00043.html is a fuller thread with patches attached (possibly applied to automake?) |
| 09:44 |
dbs |
bshum: we could add a (working) bashlike "if !-d m4 then; mkdir m4; endif;" prefix for "autoreconf -i" into the "for developers" section. it's a hack, but either we get deprecation warnings, or we hack around it. |
| 09:44 |
csharp |
there is is: http://git.savannah.gnu.org/cgit/automake.git/commit/?id=c83c133556205402d44e81d492efb0b2fe3e3584 |
| 09:44 |
* csharp |
feels like he just traversed a circle, though |
| 09:44 |
dbs |
we're not going to ask devs to patch their version of automake in 12.04 right? :) |
| 09:44 |
csharp |
correct |
| 09:45 |
bshum |
"Surely not." -- Hikaru Sulu |
| 09:45 |
csharp |
bshum++ |
| 09:48 |
bshum |
Well, whatever solution we devise for OpenSRF should apply equally to Evergreen I think, per bug 1375296 |
| 09:48 |
pinesol_green |
Launchpad bug 1375296 in Evergreen "autoreconf -i showing deprecation warnings on Ubuntu 14.04" (affected: 1, heat: 6) [Undecided,New] https://launchpad.net/bugs/1375296 |
| 09:52 |
|
krvmga joined #evergreen |
| 09:52 |
* dbs |
starts downloading https://www.mozilla.org/en-US/firefox/developer/ |
| 09:54 |
mrpeters |
that looks pretty smooth |
| 09:54 |
mrpeters |
no need for firebug with that |
| 09:54 |
bshum |
Fancy... |
| 09:55 |
* dbs |
hasn't used firebug for a long time (the native dev tools seemed good enough to him), but the new additions like webide and valence look really interesting |
| 09:55 |
kmlussier |
mmorgan: I'm wondering if we should do a sign-off for 1012308 so that the filing indicator fix gets in, and then file a separate bug on the case sensitivity issue. |
| 09:55 |
kmlussier |
bug 1012308 |
| 09:55 |
pinesol_green |
Launchpad bug 1012308 in Evergreen "Staff Client Title Sort ignores non-filing indicator information" (affected: 2, heat: 10) [Undecided,Triaged] https://launchpad.net/bugs/1012308 |
| 10:00 |
mmorgan |
kmlussier: makes sense. I'll do that |
| 10:00 |
* mmorgan |
runs to a meeting |
| 10:00 |
kmlussier |
mmorgan++ #Thanks! |
| 10:01 |
kmlussier |
yboston: You're assigned to bug 1287791. Are you still looking at that one? |
| 10:01 |
pinesol_green |
Launchpad bug 1287791 in Evergreen "More right-click authority cleanup" (affected: 1, heat: 8) [Medium,Confirmed] https://launchpad.net/bugs/1287791 - Assigned to Yamil (ysuarez) |
| 10:01 |
* kmlussier |
can load it on a Sandbox if you want to test it. |
| 10:01 |
yboston |
no, I would need the help of one of the catalogers here, but they are not available |
| 10:02 |
kmlussier |
yboston: OK, should I remove you for now in case somebody else wants to test it? |
| 10:02 |
yboston |
yes |
| 10:04 |
kmlussier |
Hmmm...I might be able to test that one if there were more info in the bug report on what I should be looking for. |
| 10:13 |
csharp |
looks like bug 1175308 is relevant |
| 10:13 |
pinesol_green |
Launchpad bug 1175308 in Evergreen "MARC editor right-click authority search is confusing" (affected: 3, heat: 16) [Medium,Fix released] https://launchpad.net/bugs/1175308 |
| 10:18 |
kmlussier |
csharp: Thanks, that helps a little bit, but still doesn't tell me the problem bug 1287791 is trying to solve. I'll post a comment on the bug to see if I can get more details. |
| 10:18 |
pinesol_green |
Launchpad bug 1287791 in Evergreen "More right-click authority cleanup" (affected: 1, heat: 8) [Medium,Confirmed] https://launchpad.net/bugs/1287791 |
| 10:38 |
pastebot |
"csharp" at 64.57.241.14 pasted "window functions problem" (40 lines) at http://paste.evergreen-ils.org/12 |
| 10:39 |
csharp |
if someone who understands WINDOW function syntax (eeevil maybe?) could check what I just pasted, I would appreciate it |
| 10:40 |
csharp |
by my understanding of the postgres docs, multiple window functions are allowed in the same query, but I'm getting a syntax error pointing at the second WINDOW definition |
| 10:41 |
tsbere |
csharp: Second WINDOW def should be split by a comma, not by another WINDOW keyword |
| 10:41 |
* csharp |
can ask in #postgresql too |
| 10:41 |
csharp |
ah |
| 10:44 |
csharp |
tsbere++ # that allowed the query to run |
| 10:44 |
csharp |
now to discover why it's still giving the wrong values ;-) |
| 10:45 |
csharp |
s/wrong/undesired/ |
| 10:45 |
tsbere |
Can't tell ya that without a much deeper understanding of the query and your actual goal. Which I don't have right now. :P |
| 10:45 |
* tsbere |
probably doesn't have time to obtain said understanding at the moment either |
| 10:46 |
csharp |
tsbere: understood |
| 10:54 |
eeevil |
kmlussier: the pre-patch bug is that we were searching on all subfields, not just controlled ones, with the right-click. so, extraneous (from the authority POV) breaks the search |
| 10:54 |
kmlussier |
eeevil: OK, thanks. If I have a moment, I'll see if I can replicate it then test the fix. |
| 11:08 |
jeff |
nice thing about trying to use gmail keyboard shortcuts in irc, since most don't involve an Enter, you have a chance to catch your mistake before sharing it with the world. |
| 11:09 |
mrpeters |
lol jeff |
| 11:09 |
mrpeters |
i always liked the gmail labs app to solve a math problem before you send |
| 11:15 |
* mrpeters |
brings up bug 1280410 for discussion. While the workaround works, Josh mentioned today that he thinks this would apply to any non-UTF-8 characters, such as a Japanese character, or other wide-character might also cause it to fail. |
| 11:15 |
pinesol_green |
Launchpad bug 1280410 in OpenSRF "Uppercase letters in trusted_domains breaks opensrf" (affected: 1, heat: 8) [Low,Confirmed] https://launchpad.net/bugs/1280410 |
| 11:23 |
bshum |
@hate dojo |
| 11:23 |
pinesol_green |
bshum: The operation succeeded. bshum hates dojo. |
| 11:23 |
csharp |
@whocares dojo |
| 11:23 |
pinesol_green |
bshum hates dojo |
| 11:23 |
csharp |
@karma dojo |
| 11:23 |
pinesol_green |
csharp: Karma for "dojo" has been increased 3 times and decreased 7 times for a total karma of -4. |
| 11:24 |
csharp |
mrpeters: I saw the same problem happen when I had a hostname that began with a number (e.g. '2-7-0-testbox') |
| 11:25 |
csharp |
wait - maybe not the same issue, but I saw breakage |
| 11:26 |
kmlussier |
eeevil++ #Helping to rescue paxed's patch |
| 11:26 |
* mrpeters |
tries to install Evergreen without OpenSRF -- fail! |
| 11:27 |
mrpeters |
im spoiled not installing by hand anymore heh |
| 11:37 |
eeevil |
kmlussier++ # testing patches! |
| 11:37 |
|
sandbergja joined #evergreen |
| 11:40 |
kmlussier |
eeevil: Heh, I'm actually doing very little testing today, but maybe I can get some done this afternoon. |
| 11:43 |
mrpeters |
hrmmm |
| 11:43 |
mrpeters |
14.04 not liking OpenSRF master |
| 11:43 |
mrpeters |
checking for apache2... no |
| 11:43 |
mrpeters |
./configure: line 12776: syntax error near unexpected token `CHECK,' |
| 11:43 |
mrpeters |
./configure: line 12776: `PKG_CHECK_MODULES(CHECK, check >= 0.9.0, enable_tests=yes,' |
| 11:43 |
mrpeters |
apache2 is installed, fwiw |
| 11:44 |
berick |
mrpeters: hm, did you run autoreconf -i first? |
| 11:45 |
mrpeters |
apparently not |
| 11:45 |
mrpeters |
swore i did |
| 11:45 |
mrpeters |
<<< like a rookie again haha |
| 11:46 |
csharp |
okay, even if we accept the fix for bug 1206936, I think it might be enough of a change that it needs to be targeted toward whatever the next release is |
| 11:46 |
pinesol_green |
Launchpad bug 1206936 in Evergreen "money.transaction_billing_summary view displays incorrect billing_type and billing_note for the actual last transaction" (affected: 1, heat: 6) [Medium,Triaged] https://launchpad.net/bugs/1206936 |
| 11:47 |
csharp |
I'm still working on it, and I'm going to rely heavily on review from people like eeevil |
| 11:48 |
csharp |
it's one of those things that keeps growing heads as I work, though I feel like I have a good handle on window functions at this point |
| 11:50 |
bshum |
So, I was toying with https://bugs.launchpad.net/evergreen/+bug/1361786 and I'm getting hung up on something |
| 11:50 |
pinesol_green |
Launchpad bug 1361786 in Evergreen "Copy Template Editor Summary Displays Database IDs Rather Than Helpful Information" (affected: 1, heat: 6) [Undecided,New] |
| 11:50 |
bshum |
AutoGrid in these interfaces bases the table on what's in the fieldmapper fm_IDL.xml? |
| 11:51 |
csharp |
yes - I looked at that bug too |
| 11:51 |
csharp |
(several weeks ago, post hackaway) |
| 11:53 |
bshum |
I feel like I'm missing something else obvious then |
| 11:54 |
bshum |
Cause otherwise, tiny tweaks to the fieldmapper file, with restarts, ought to change something |
| 11:54 |
bshum |
Or maybe there's more in the js files |
| 11:54 |
bshum |
Sigh |
| 11:54 |
* bshum |
keeps reading |
| 11:55 |
csharp |
pastebot-- |
| 11:55 |
csharp |
we really need to fix that ID re-use issue, or find a different solution |
| 11:55 |
* csharp |
was looking at older IRC logs that referenced a now-gone paste |
| 11:56 |
* bshum |
welcomes suggestions on that |
| 11:57 |
* tsbere |
just uses an outside service ;) |
| 11:57 |
bshum |
We can always go back to that. |
| 11:58 |
bshum |
It's not like the pastebot does a great job with sending the message back to channel if someone doesn't fill the fields out properly |
| 11:58 |
bshum |
But it tries I guess |
| 12:09 |
|
jihpringle joined #evergreen |
| 12:24 |
bshum |
I made "pullrequest" an official tag for OpenSRF |
| 12:24 |
bshum |
I missed the autocomplete for it :) |
| 12:25 |
|
maryj joined #evergreen |
| 12:27 |
csharp |
I asked eeevil this in a PM, but I'll ask the channel... how does one disable propagation when reingesting authority records? |
| 12:28 |
* csharp |
eyes 'ingest.metarecord_mapping.skip_on_update' |
| 12:29 |
bshum |
Anyone have a Debian Jessie image with Evergreen on it? I think https://bugs.launchpad.net/evergreen/+bug/1208915 no longer applies (or at least I couldn't replicate it on Ubuntu 14.04 with Apache 2.4.7) |
| 12:29 |
pinesol_green |
Launchpad bug 1208915 in Evergreen "Apache 2.4.6 warns about eg.conf" (affected: 2, heat: 10) [Undecided,New] |
| 12:29 |
bshum |
Actually yeah nevermind |
| 12:29 |
bshum |
I got it |
| 12:30 |
berick |
i have a jessie vm i can test on if needed |
| 12:30 |
bshum |
We already fixed it in another bug |
| 12:30 |
bshum |
Looks like a dupe remnant |
| 12:31 |
berick |
cool |
| 12:33 |
bshum |
berick: I did just file https://bugs.launchpad.net/opensrf/+bug/1391248 for OpenSRF though, to deal with the NameVirtualHost warnings. I think that it would similar affect Jessie like it does Trusty |
| 12:33 |
pinesol_green |
Launchpad bug 1391248 in OpenSRF "NameVirtualhost warnings in Apache 2.4" (affected: 1, heat: 6) [Low,Triaged] |
| 12:33 |
* dbs |
recently added HTTPS-everywhere clauses for the catalogue and a number of services, maybe we could add something like that (commented out, of course, so that sites without valid certs don't freak) to the sample configs |
| 12:34 |
berick |
bshum: indeed. i'll take a look at that.. |
| 12:34 |
mrpeters |
argh |
| 12:34 |
mrpeters |
happy settings-tester, 500 error on opac |
| 12:34 |
mrpeters |
on 14.04 |
| 12:34 |
* csharp |
finds ingest.disable_authority_auto_update and assumes that might be the one |
| 12:35 |
mrpeters |
master opensrf/evergreen -- any magic im missing? |
| 12:35 |
mrpeters |
[10/Nov/2014:12:35:12 -0500] "GET /eg/opac/home HTTP/1.1" 500 812 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:33.0) Gecko/20100101 Firefox/33.0" the only logging i get from apache side |
| 12:36 |
csharp |
actually... aside from upgrade scripts, it looks like that setting is never referenced |
| 12:36 |
dbs |
mrpeters: eh, I'm not sure settings-tester is particularly useful anymore :/ |
| 12:37 |
mrpeters |
maybe not, srfsh login is fine too |
| 12:37 |
mrpeters |
its just opac seemingly |
| 12:37 |
|
nhilton joined #evergreen |
| 12:39 |
kmlussier |
dbwells/yboston: Can I add a pullrequest tag on bug 1389403? |
| 12:39 |
pinesol_green |
Launchpad bug 1389403 in Evergreen "OPAC numeric search's call number search bug with LC call numbers " (affected: 1, heat: 6) [Undecided,New] https://launchpad.net/bugs/1389403 |
| 12:40 |
pastebot |
"berick" at 64.57.241.14 pasted "bshum are you also getting this error w/ opensf/apache ?" (1 line) at http://paste.evergreen-ils.org/13 |
| 12:40 |
mrpeters |
ah, now some more logs coming in |
| 12:40 |
bshum |
berick: Hmm.... I didn't see that when I setup. |
| 12:41 |
bshum |
But my VM has a FQDN |
| 12:41 |
berick |
seeing that on trusty w/ apache2ctl-websockets configtest |
| 12:41 |
bshum |
Maybe without it, it spits that out |
| 12:42 |
berick |
easy to fix w/: ServerName localhost |
| 12:42 |
dbwells |
kmlussier: I think that would be fine. |
| 12:42 |
* bshum |
checks to make sure he doesn't have any other local fixes |
| 12:42 |
kmlussier |
dbwells: OK, thanks! |
| 12:44 |
|
ericar joined #evergreen |
| 12:46 |
mrpeters |
--force-clean-process++ |
| 12:47 |
|
Dyrcona joined #evergreen |
| 12:50 |
mrpeters |
anyone else using opensrf/evergreen master (as of today) on 14.04? getting nothing relevant in logs about this 500 error |
| 12:50 |
mrpeters |
apache 2.4.7, fwiw |
| 12:51 |
* csharp |
learns that "propagation" of authority records is limited to linking with bibs |
| 12:51 |
bshum |
mrpeters: My test VM is 14.04 with master as of a few days ago and have no errors. |
| 12:51 |
mrpeters |
opensrf master too? |
| 12:51 |
bshum |
Yes |
| 12:51 |
mrpeters |
damn, i hate wasting half a day i could have been looking at bugs trying to get this running |
| 12:53 |
csharp |
mrpeters: I spent a good portion of the 2013 hackaway doing the same ;-) |
| 12:53 |
mrpeters |
haha |
| 12:54 |
mrpeters |
i've been back through everything, made sure i have the apache 2.4 configs, its just strange |
| 12:54 |
mrpeters |
not getting anything in the apache logs |
| 12:54 |
mrpeters |
just my 500 error in other_vhosts |
| 12:54 |
csharp |
so nothing in the apache logs? |
| 12:54 |
bshum |
Hmm, I just added targets for https://bugs.launchpad.net/evergreen/+bug/1339190 but now that I look at it again, I wonder if we even need Evergreen targets. Seems like it's all SIPServer side work? eeevil? :) |
| 12:54 |
pinesol_green |
Launchpad bug 1339190 in Evergreen "SIPServer is heavy, not my brother" (affected: 3, heat: 14) [Wishlist,Triaged] |
| 12:55 |
mrpeters |
csharp: nope -- i have nothing except the other_vhosts_access.log |
| 12:55 |
|
hbrennan joined #evergreen |
| 12:55 |
csharp |
@who is SIPServer's brother? |
| 12:55 |
pinesol_green |
Stompro is SIPServer's brother. |
| 12:55 |
Dyrcona |
mrpeters: Evergreen Apache configs started logging to syslog by default a while ago. I keep a branch around that I apply to my local builds to change it back. |
| 12:56 |
mrpeters |
ah, interesting. i hadn't realized |
| 12:56 |
bshum |
Oh right.... |
| 12:56 |
Dyrcona |
mrpeters: The old config is still there. It's a matter of uncommenting a couple lines and then commenting the other two. |
| 12:56 |
* csharp |
always applies the rsyslog config to any server he'll be using for more than 5 minutes |
| 12:56 |
mrpeters |
seems to be getting hung up on opensrf.settings.host_config.get |
| 12:56 |
bshum |
I always just use the rsyslog example now |
| 12:56 |
Stompro |
Hey, SIPServer still owes me 20 bucks, have you seen him. |
| 12:56 |
|
nhilton_ joined #evergreen |
| 12:56 |
bshum |
csharp++ |
| 12:56 |
csharp |
Stompro++ |
| 12:57 |
* Dyrcona |
prefers the separate logs for Apache. |
| 12:57 |
csharp |
Dyrcona: I can definitely see the value in that |
| 13:00 |
Dyrcona |
bshum: Looking at the comments, lp 1339190 has both SIPServer and Evergreen branches. |
| 13:00 |
pinesol_green |
Launchpad bug 1339190 in Evergreen "SIPServer is heavy, not my brother" (affected: 3, heat: 14) [Wishlist,Triaged] https://launchpad.net/bugs/1339190 |
| 13:00 |
mrpeters |
strange.... |
| 13:00 |
mrpeters |
Nov 10 13:00:33 eg-master apache2[10888]: [perl:error] [pid 10888] [client 73.176.215.80:53682] Cannot sysopen /openils/var/log/osrfsys.log: Permission denied at /usr/local/share/perl/5.18.2/OpenSRF/Utils/Logger.pm line 282.\n |
| 13:00 |
bshum |
Dyrcona: Ah, I missed it. Thanks :) |
| 13:00 |
bshum |
mrpeters: Is /openils owned by opensrf? Or is the apache service being run as the opensrf user? |
| 13:00 |
Dyrcona |
mrpeters: A) Who owns /openils/? B) What user does Apache run as? |
| 13:00 |
Dyrcona |
bshum: Jinx! |
| 13:01 |
mrpeters |
well, thats where i may be misconfigured here |
| 13:01 |
Dyrcona |
;) |
| 13:01 |
bshum |
Dyrcona: :) |
| 13:01 |
mrpeters |
i didn't explicitly tell it which user to use |
| 13:01 |
mrpeters |
i didnt see that in the readme |
| 13:01 |
mrpeters |
but i thought maybe that was handled by the apache2.4 config examples |
| 13:01 |
Dyrcona |
It should be in the readme. |
| 13:01 |
bshum |
Yeah it is |
| 13:01 |
csharp |
huh - after searching, I don't see a way to disable propagation of authority records when reingesting |
| 13:01 |
bshum |
Change `export APACHE_RUN_USER=www-data` to `export APACHE_RUN_USER=opensrf`. |
| 13:02 |
mrpeters |
ahh yes i see it now |
| 13:02 |
bshum |
It's definitely in the README |
| 13:02 |
mrpeters |
that'll do it |
| 13:02 |
mrpeters |
i knew that had to be changed, i just thought it might be getting done by Evergreen now....i skipped right over that |
| 13:03 |
Dyrcona |
csharp: config.internal_flag ingest.disable_authority_auto_update |
| 13:03 |
Dyrcona |
or wait, maybe it is: ingest.disable_authority_linking |
| 13:03 |
csharp |
Dyrcona: a grep of the code doesn't show that setting being consulted |
| 13:03 |
csharp |
ok |
| 13:03 |
bshum |
Heh |
| 13:04 |
Dyrcona |
Think it is in a trigger somewhere. |
| 13:04 |
mrpeters |
problem solved |
| 13:04 |
mrpeters |
bshum++ Dyrcona++ |
| 13:04 |
mrpeters |
that was dumb |
| 13:04 |
jeff |
of course, grep/ack are powerless in the face of some things like autogeneration. :-) |
| 13:05 |
csharp |
jeff: is it autogenerated somewhere? looks like a DB function to me... |
| 13:05 |
jeff |
csharp: sorry, i wasn't speaking to this specific case. just a general caution against "nothing references this, grep/ack confirms!" |
| 13:06 |
|
nhilton joined #evergreen |
| 13:06 |
csharp |
jeff: gotcha |
| 13:06 |
csharp |
okay - looks like ingest.disable_authority_linking is the ticket |
| 13:06 |
mrpeters |
bshum -- you looking at this today? https://bugs.launchpad.net/evergreen/+bug/1197636 |
| 13:06 |
pinesol_green |
Launchpad bug 1197636 in Evergreen "Email record detail does not check for email" (affected: 1, heat: 8) [Medium,Triaged] - Assigned to Ben Shum (bshum) |
| 13:06 |
* csharp |
moves to remove all settings that aren't consulted anywhere |
| 13:07 |
* csharp |
adds that he is willing to do the footwork on that, but not today ;-) |
| 13:07 |
mrpeters |
i should probably work on https://bugs.launchpad.net/evergreen/+bug/914800 too since i reported it |
| 13:07 |
pinesol_green |
Launchpad bug 914800 in Evergreen "Attempting to merge user in collections provides an unfriendly error message" (affected: 3, heat: 18) [Low,Confirmed] |
| 13:07 |
bshum |
mrpeters: I haven't had time to play with it further this year. |
| 13:07 |
bshum |
So if you want to snag it, that'd be cool :) |
| 13:08 |
mrpeters |
ok, im going to look at that merging patron in collections error first....i forgot about that one |
| 13:09 |
csharp |
huh - looks like that setting isn't in place on my 2.7.1 DB |
| 13:09 |
bshum |
csharp: Missing seed data or bad upgrade script? |
| 13:09 |
bshum |
:\ |
| 13:10 |
kmlussier |
Stompro: In answer to your question in https://bugs.launchpad.net/evergreen/+bug/1124498/comments/12, if I were to pick an interval out of a hat, I probably would go with 30 days. |
| 13:10 |
pinesol_green |
Launchpad bug 1124498 in Evergreen "Wishlist: Patron notification via email when card is about to expire" (affected: 4, heat: 28) [Wishlist,In progress] - Assigned to Josh Stompro (u-launchpad-stompro-org) |
| 13:11 |
kmlussier |
It's something that can be customized, so if there were a library that expires accounts more frequently than every month, they could change it. |
| 13:12 |
csharp |
bshum: must have been a long time ago, because that has been around since the 1.6-2.0 upgrade script :-/ |
| 13:12 |
bshum |
Still happens. |
| 13:14 |
csharp |
@who has been upgrading from 1.6 to 2.0 for the last 2 and a half years? |
| 13:14 |
pinesol_green |
edoceo has been upgrading from 1.6 to 2.0 for the last 2 and a half years. |
| 13:15 |
kmlussier |
@dessert [someone] |
| 13:15 |
* pinesol_green |
grabs some banana split for dbwells |
| 13:17 |
|
ericar joined #evergreen |
| 13:22 |
mrpeters |
looks like the xulrunner FTP may be broken in master (14.0.1) |
| 13:22 |
mrpeters |
if you use ftp, ==> PASV ... done. ==> RETR xulrunner-14.0.1.en-US.win32.zip ... |
| 13:22 |
mrpeters |
No such file ‘xulrunner-14.0.1.en-US.win32.zip’. |
| 13:23 |
mrpeters |
but the file is there, and can be downloaded via https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/14.0.1/runtimes/ |
| 13:23 |
mrpeters |
just a note to manually grab that xulrunner zip or tar that is appropriate for your OS when building a staff client for master right now |
| 13:25 |
Dyrcona |
mrpeters: I didn't have a problem with it on Friday. |
| 13:25 |
Dyrcona |
Hm... Maybe I didn't actually download it. I may have used one that was retrieved earlier. |
| 13:25 |
mrpeters |
i dont have a problem if i use an ftp client on windows, but for whatever reason, make build win-client says file not found when it tries to grab off the ftp |
| 13:26 |
mrpeters |
so i just did a wget from https and moved on |
| 13:26 |
bshum |
Maybe there's a problem with the mozilla site. |
| 13:26 |
mrpeters |
wget from ftp:// also failed with same error |
| 13:26 |
mrpeters |
i definetly think its on their end |
| 13:26 |
bshum |
I was having problems with grabbing the lin32 build earlier today. |
| 13:26 |
mrpeters |
weirdly, FTP through firefox can find the file too |
| 13:31 |
* csharp |
wgets all the xulrunner files and throws them into http://archive.georgialibraries.org/xulrunner/ |
| 13:31 |
csharp |
since that server is under our control, it can be a fallback (or the main site can be a fallback) |
| 13:33 |
dbs |
could be that the servers are overloaded because of the Firefox Dev release today :? |
| 13:37 |
Dyrcona |
Could be.... |
| 13:38 |
kmlussier |
jihpringle: Do you use the Load Catalog Record IDS interface in acq at all? |
| 13:38 |
jihpringle |
we've testes it but don't really use it |
| 13:38 |
jihpringle |
testes = tested |
| 13:38 |
csharp |
hmm - that setting is not stopping authority propogation - looks like if the reingest on same marc setting is enabled, it just powers through |
| 13:39 |
* csharp |
consider re-adding the old setting |
| 13:39 |
kmlussier |
Ah, ok. We don't use it much either, but I'm noticing that it has a "Load more terms" button. The label doesn't make sense to me. |
| 13:39 |
kmlussier |
Seems like it should be something like "Load more records" or maybe "Load more lineitems." |
| 13:40 |
jihpringle |
I like your label suggestions, they make more sense to me too |
| 13:41 |
jihpringle |
LP 891785 has stopped us from strongly recommedending it to our libraries |
| 13:41 |
pinesol_green |
Launchpad bug 891785 in Evergreen "Acq: Entire from_bib list doesn't transfer" (affected: 1, heat: 6) [Undecided,Triaged] https://launchpad.net/bugs/891785 |
| 13:42 |
kmlussier |
jihpringle: That's and old one. I'll see if I can confirm it while I'm in there. |
| 13:44 |
mrpeters |
can one just insert a usr id into money.collections_tracker to forcefully send them to collections? |
| 13:44 |
mrpeters |
or, better yet, is there a shortcut button in the staff client to send a patron to collections? |
| 13:45 |
csharp |
it's an opensrf call, iirc |
| 13:45 |
mrpeters |
yeah a srfsh script i think isnt it |
| 13:48 |
mrpeters |
but INSERT into money.collections_tracker (usr, collector, location, enter_time) VALUES (87, 1, 1, now()); does accomplish the same thing |
| 13:48 |
mrpeters |
where 87 = usr.id |
| 13:49 |
mrpeters |
sweet, so i've got an ilsevent id properly associated now just need to link up the text so it doesnt show skull and crossbones |
| 13:50 |
yboston |
I need help witht he main repo. I tweaked a docs commit before pushing to master, but forgot to reset the "author" value |
| 13:50 |
pinesol_green |
[evergreen|Yamil Suarez] Documentation: LP#1386854 - Locally Hosted Added Content. - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=caf6c6a> |
| 13:51 |
yboston |
what is the best way to undo this? I can quickly amend it , and if noone pushes before I think I'll be OK? though I am not sure |
| 13:53 |
|
terran joined #evergreen |
| 13:56 |
Dyrcona |
yboston: I'm not sure about that. It's pull, not push, that is the real problem, and the master repo pushes to other repos automatically, thus mimicking a pull on their end. |
| 13:56 |
Dyrcona |
IOW, I don't think you can fix the commit without their being pain at this point. |
| 13:56 |
yboston |
Dyrcona: yes, pull is the problem, |
| 13:57 |
yboston |
Dyrcona: I usually don't make this mistake, will be more carefull going forward |
| 13:57 |
Dyrcona |
s/their/there/ # I sometimes think English is a silly joke played on us by the Angles and the Francs. |
| 13:57 |
yboston |
Dyrcona: at least the author is listed in the sign off |
| 13:58 |
yboston |
Stompro: heads up, I missed giving you credit for a docs commit on master. Will make sure the credit is there for when I push to other releases |
| 13:58 |
Dyrcona |
yboston: Don't sweat it. I've done it once or twice myself when brining in patches. |
| 14:00 |
|
nhilton_ joined #evergreen |
| 14:06 |
gmcharlt |
has anybody yet received mbreeding's survey regarding patron privacy and security in ILSs? |
| 14:07 |
gmcharlt |
(the Koha project has gotten a copy) |
| 14:07 |
csharp |
not I |
| 14:08 |
kmlussier |
Nope |
| 14:08 |
kmlussier |
gmcharlt: Is that the survey that was sent out to the Koha list over the weekend? |
| 14:08 |
csharp |
mbreeding appears to equate Equinox and the Evergreen Project, so that doesn't surprise me too much |
| 14:08 |
gmcharlt |
csharp: to be clear, I don't think ESI has received it |
| 14:08 |
csharp |
gmcharlt: good to know |
| 14:09 |
csharp |
and no dig intended (at ESI anyway ;-) ) |
| 14:09 |
gmcharlt |
I just want to double-check before I ask him to send it to info eg-ils.org |
| 14:10 |
* csharp |
should strive to have less of a snarky hair trigger around LJ and open source |
| 14:10 |
gmcharlt |
kmlussier: different from the Library Automation Perceptions survey |
| 14:12 |
* gmcharlt |
has gone ahead and dropped Marshall a line |
| 14:12 |
rangi |
csharp: its so hard to be less snarky, when they prove you right about being snarky every darn time ;) |
| 14:12 |
csharp |
gmcharlt++ |
| 14:12 |
csharp |
rangi: true ;-) |
| 14:16 |
|
terran joined #evergreen |
| 14:17 |
Stompro |
kmlussier: Thanks |
| 14:21 |
gmcharlt |
bshum: are you planning on doing a 2.7.2 or a 2.7.1-take2? |
| 14:21 |
gmcharlt |
in re the auto-logout patch |
| 14:22 |
Stompro |
yboston: No problem, thanks for committing it. |
| 14:23 |
bshum |
gmcharlt: I just changed the files in the existing tarball earlier this morning. |
| 14:23 |
bshum |
The original is there with -old |
| 14:23 |
bshum |
I can certainly name it as such, but it seemed a trivial drop in |
| 14:24 |
gmcharlt |
yeah, though I think I still want a 'a', as in 2.7.1a |
| 14:24 |
gmcharlt |
or the like |
| 14:25 |
gmcharlt |
quietly unbrownbagging the release is more for catching something a few minutes after putting a tarball up |
| 14:25 |
gmcharlt |
not a couple days |
| 14:25 |
gmcharlt |
IMO, anyway |
| 14:25 |
* bshum |
is fine with that |
| 14:26 |
jboyer-isl |
Out of curiosity re: 2.7.1 and that patch, was the tags/rel_2_7_1 branch also updated? |
| 14:26 |
Dyrcona |
csharp++ rangi++ |
| 14:26 |
Dyrcona |
gmcharlt++ |
| 14:27 |
Dyrcona |
bshum +1 on 2.7.1a |
| 14:27 |
* jboyer-isl |
should just check |
| 14:27 |
bshum |
jboyer-isl: Yes, I added thr patch to the tag 2.7.1 branch |
| 14:28 |
jboyer-isl |
bshum++ |
| 14:28 |
* Dyrcona |
saw the commit message a couple of hours ago. |
| 14:28 |
jboyer-isl |
I’ll try to keep my easily verified lazygoogles to a minimum from now on. |
| 14:28 |
bshum |
It's an easy rename on Lupin |
| 14:28 |
* bshum |
is eating lunch first. |
| 14:29 |
jboyer-isl |
Dyrcona: I don’t follow the commits list I assumed it would be too high traffic, though that may not actually be the case. |
| 14:29 |
Dyrcona |
jboyer-isl: It's lower traffic than the launchpad bugs list. |
| 14:30 |
jboyer-isl |
Shows what I know. time to sign up. Thanks |
| 14:31 |
|
nhilton joined #evergreen |
| 14:32 |
bshum |
Fwiw, I just check the gitweb instead of signing up to more mail |
| 14:37 |
eeevil |
csharp: found the source of your problem ... a1612cfd6 |
| 14:37 |
pinesol_green |
[evergreen|dbs] Switch to ingesting authority records automatically via database triggers - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=a1612cf> |
| 14:38 |
eeevil |
specifcally: git log --patch -1 a1612cfd664fc9af03c6e7487516b5f61ea5b644 -- Open-ILS/src/sql/Pg/030.schema.metabib.sql |
| 14:38 |
pinesol_green |
[evergreen|dbs] Switch to ingesting authority records automatically via database triggers - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=a1612cf> |
| 14:39 |
eeevil |
csharp: I'll put up a branch to bring back the effect of ingest.disable_authority_auto_update |
| 14:46 |
csharp |
eeevil: I may have jumped the gun: bug 1391290 |
| 14:46 |
pinesol_green |
Launchpad bug 1391290 in Evergreen "No way to disable authority record propagation at ingest" (affected: 1, heat: 6) [Medium,New] https://launchpad.net/bugs/1391290 - Assigned to Chris Sharp (chrissharp123) |
| 14:46 |
eeevil |
oh? |
| 14:46 |
pinesol_green |
[opensrf|Ben Shum] LP#1391248: Fix NameVirtualHost warnings in websockets apache2.conf - <http://git.evergreen-ils.org/?p=OpenSRF.git;a=commit;h=db4e107> |
| 14:46 |
csharp |
http://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=cc03e355094fadd5bc24642f00bc9c153bed61bc |
| 14:47 |
csharp |
I see a typo, now that that's public ('ropagate') |
| 14:49 |
eeevil |
csharp: that's exactly the same as mine (sans typo) except for one change I'd suggest: change the PERFORM line that fires the propagation to simply "PERFORM authority.propagate_changes(NEW.id);" ... the FROM and WHERE are needless. |
| 14:49 |
csharp |
oh - cool |
| 14:49 |
eeevil |
so, if you want to force-push those changes, I'll sign off and merge :) |
| 14:49 |
csharp |
well, go ahead and use yours, since it's ready to roll ;-) |
| 14:50 |
csharp |
either way |
| 14:50 |
eeevil |
mines not ready ... was about to make the upgrade script, but you have one already |
| 14:50 |
eeevil |
mine's, even |
| 14:50 |
csharp |
ok - I'll correct mine then |
| 14:50 |
eeevil |
the mines, they are ready |
| 14:50 |
csharp |
thanks |
| 14:50 |
csharp |
;-) |
| 14:53 |
* mmorgan |
resurfaces from testing lp 1210541 if anyone wants to have a look. |
| 14:53 |
pinesol_green |
Launchpad bug 1210541 in Evergreen "Copy locations table should have a 'deleted' flag" (affected: 9, heat: 52) [Wishlist,Confirmed] https://launchpad.net/bugs/1210541 |
| 14:53 |
mmorgan |
jboyer-isl++ |
| 14:55 |
jboyer-isl |
Stompro++ for finding the seed data damage I left in there. |
| 14:56 |
csharp |
eeevil: force pushed - thanks! |
| 14:57 |
csharp |
eeevil: hold on - I see a problem :-/ |
| 14:57 |
csharp |
nevermind - the gitweb page hadn't loaded all the way :-) |
| 15:03 |
eeevil |
csharp: one minor nit (I can take care of it if you want, but for the future), don't include the volatility, cost or ownership change stuff for functions unless you know they're needed |
| 15:04 |
eeevil |
at the bottom of the upgrade script |
| 15:05 |
jboyer-isl |
Bmagic++ for actually finding my seed data mistake |
| 15:05 |
jboyer-isl |
Stompro++ is for the great work on recent docs. |
| 15:05 |
* jboyer-isl |
needs some sleep, apparently |
| 15:06 |
Stompro |
jboyer-isl: Should that be a blake-j++ (Not sure of irc username) |
| 15:07 |
* Stompro |
nevermind, reading fail. |
| 15:07 |
mrpeters |
ok...im stumped...where does the magic happen to link an ILS event to a friendly error message (say "textcode" from ils_events.xml), instead of a debug/stacktrace popup? |
| 15:07 |
|
nhilton_ joined #evergreen |
| 15:10 |
mrpeters |
rather, an "Unhandled Error" dialog, to be exact |
| 15:10 |
mrpeters |
is there some linkage in the xul code that i'm missing perhaps? |
| 15:11 |
mrpeters |
(and the associated javascript -- im looking at you patron/util.js!) |
| 15:13 |
|
artunit joined #evergreen |
| 15:15 |
csharp |
eeevil: yeah, I actually copied and pasted that from pgadmin3 - feel free to make the edit |
| 15:16 |
csharp |
thanks |
| 15:22 |
jboyer-isl |
mrpeters: “Unhandled Error” means that there’s nothing handling the issue, so there’s more code to add that checks out what the error is and then find the correct error string. |
| 15:23 |
jboyer-isl |
Check out Open-ILS/xul/staff_client/server/patron/search_result.js line 157 for an example. |
| 15:23 |
mrpeters |
yeah. i did this once before, i was hoping the js console would help lead the way to where the code is missing |
| 15:24 |
mrpeters |
i think its just falling through to the catch all at the end of the block |
| 15:24 |
|
nhilton joined #evergreen |
| 15:24 |
jboyer-isl |
Oh, yeah. If you get a skull and crossbones that means that as far as xulrunner is concerned it is being handled. Makes this kind of inconvenient. |
| 15:24 |
mrpeters |
mmm its going to want to get the error message with getString...i dont know why i thought that was coming from ils_events.xml |
| 15:26 |
jboyer-isl |
It depends on which i18n method was used where you’re working. I suspect it’ll be a in a .properties file, but I’m just guessing at the moment. |
| 15:26 |
Dyrcona |
mrpeters: The backend does occasionally throw an event that is not in ils_events.xml. |
| 15:26 |
mrpeters |
Dyrcona: sure, i was just attempting to fix this 2 year old bug i submitted for when the sub user in a merge is in collections |
| 15:26 |
mrpeters |
deserves an explanatory error message |
| 15:26 |
Dyrcona |
mrpeters: Gotcha. |
| 15:26 |
mrpeters |
i did this a while back, but my branch is gone :( |
| 15:27 |
mrpeters |
https://bugs.launchpad.net/evergreen/+bug/647121 |
| 15:27 |
pinesol_green |
Launchpad bug 647121 in Evergreen "STAFF_CHR override gives generic skull and crossbone error when aborting override, " (affected: 1, heat: 6) [Low,Fix released] |
| 15:27 |
|
bradl joined #evergreen |
| 15:28 |
|
jboyer-isl left #evergreen |
| 15:29 |
|
jboyer-isl joined #evergreen |
| 15:29 |
mmorgan |
can anyone offer git assistance? getting a conflict: |
| 15:29 |
mmorgan |
$ git merge origin/master |
| 15:29 |
mmorgan |
Auto-merging Open-ILS/src/templates/opac/parts/record/copy_table.tt2 |
| 15:29 |
mmorgan |
CONFLICT (content): Merge conflict in Open-ILS/src/templates/opac/parts/record/copy_table.tt2 |
| 15:29 |
mmorgan |
Automatic merge failed; fix conflicts and then commit the result. |
| 15:29 |
mrpeters |
mmorgan: did you edit your copy_table.tt2 file in your git repo? |
| 15:29 |
mrpeters |
if so, when you do the merge, it's detecting a conflict. if you open that file, the conflict will be enclosed in <<< and >>> |
| 15:30 |
mrpeters |
you have to pick which block of code is the correct one to keep |
| 15:30 |
Dyrcona |
And, sometimes its more complicated than that if you want to keep bits from both blocks. |
| 15:30 |
mmorgan |
disclaimer - still a newbie with git |
| 15:31 |
mmorgan |
I probably did with one branch, can I delete the branch? |
| 15:31 |
mrpeters |
https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ |
| 15:31 |
mrpeters |
hmm, its ok if you edited it in a branch |
| 15:31 |
mrpeters |
are you trying to merge master with that branch right now? |
| 15:32 |
kmlussier |
mmorgan: Are you in that branch right now or are you in the master branch? |
| 15:33 |
|
ericar_ joined #evergreen |
| 15:33 |
mmorgan |
mrpeters: maybe... kmlussier: I am in the branch right now, and maybe that's the problem. |
| 15:34 |
Dyrcona |
mrpeters: http://git.evergreen-ils.org/?p=working/Evergreen.git;a=commitdiff;h=b82f69844875d05272cc6d93d90b2160f0f9acf4 |
| 15:34 |
pinesol_green |
[evergreen|Michael Peters] LP#647121 Event handling on override abort - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=b82f698> |
| 15:35 |
Dyrcona |
mrpeters: I found it with git log --until <date> |
| 15:35 |
csharp |
mmorgan: can you pastebin the current contents of Open-ILS/src/templates/opac/parts/record/copy_table.tt2? |
| 15:35 |
csharp |
somebody will be able to identify how to resolve the conflict |
| 15:36 |
csharp |
mmorgan: With our combined strength, we can end this destructive conflict, and bring order to the galaxy. |
| 15:37 |
kmlussier |
csharp++ |
| 15:37 |
mmorgan |
csharp++ |
| 15:37 |
mmorgan |
can I get the contents of that file with a git command? |
| 15:38 |
csharp |
mmorgan: are you on the command line? which OS? |
| 15:38 |
Dyrcona |
git diff will show changes between your working state and the last commit. |
| 15:39 |
* mmorgan |
really is a git newbie |
| 15:39 |
Dyrcona |
Might be better to just open the file in an editor and copy and past the whole thing. |
| 15:39 |
Dyrcona |
s/(past)/\1e/ |
| 15:39 |
mmorgan |
am using Git Bash, but maybe I need to be in an external editor? Outside of git? |
| 15:39 |
kmlussier |
mmorgan: You can use vim |
| 15:39 |
|
mdriscoll joined #evergreen |
| 15:40 |
csharp |
mmorgan: on Windows, I would recommend Notepad++ |
| 15:40 |
* mmorgan |
loves vim |
| 15:40 |
tsbere |
I use vim/gvim almost everywhere |
| 15:40 |
mrpeters |
thanks Dyrcona -- was thinking i did more with that one. bummer. |
| 15:40 |
mmorgan |
Notepad++ isn't bad either :) |
| 15:40 |
kmlussier |
mmorgan: Love is a rather strong word when it comes to vim. |
| 15:40 |
jboyer-isl |
mrpeters: in Open-ILS/xul/staff_client/server/patron/util.js there’s already a try/catch re: merging at line 947. It’ll need some reworking to both use an error message vs. error code, and extra work if you don’t want the skull and crossbones style error. |
| 15:41 |
csharp |
mmorgan++ # I love vim too, but usually don't recommend it to people claiming to be newbies ;-) |
| 15:41 |
csharp |
vim++ |
| 15:41 |
csharp |
@love vim |
| 15:41 |
pinesol_green |
csharp: The operation succeeded. csharp loves vim. |
| 15:41 |
kmlussier |
csharp: Being a git newbies isn't the same as being a command lime newbie. ;) |
| 15:41 |
csharp |
kmlussier: true |
| 15:41 |
mrpeters |
yeah, its at the end of that whole block right jboyer-isl? |
| 15:41 |
* mmorgan |
gets vim, not git ;-) |
| 15:41 |
kmlussier |
s/lime/line |
| 15:42 |
csharp |
@band add Command Lime |
| 15:42 |
pinesol_green |
csharp: Sorry, that command is only available to Evergreen Premium™ Subscribers. Please upgrade your subscription ASAP! |
| 15:42 |
Dyrcona |
git diff -- Open-ILS/src/templates/opac/parts/record/copy_table.tt2 |
| 15:42 |
mrpeters |
catch(E) { |
| 15:42 |
mrpeters |
dump('patron.util.merge: ' + js2JSON(E) + '\n'); |
| 15:42 |
mrpeters |
try { error.standard_unexpected_error_alert('Error in patron.util.merge',E); } catch(F) { alert('patron.util.merge: ' + E + '\n'); } |
| 15:42 |
mrpeters |
return false; |
| 15:42 |
* kmlussier |
knows mmorgan well enough to know she could work with vim. :) |
| 15:42 |
Dyrcona |
That will show the changes in the file. |
| 15:42 |
mrpeters |
almost seems like this was just done kind of in a rush when the merge button was added |
| 15:43 |
Bmagic |
Before I submit this bug report I want to make sure that I'm not the only one. When viewing a bib OPAC view in the staff client, each item has a view/edit button next to the barcode. If you click on edit and change the call number, then click "re-barcode/update items" - The system will create a NEW volume instead of editing |
| 15:43 |
Dyrcona |
mrpeters: could be. I've seen similar code elsewhere. |
| 15:43 |
jboyer-isl |
947-951 is the catch for the patron merge function. (there’s another try/catch for the “fancy” erorr display on line 949.) The call to error.standard_unexpected_error_alert is what brings up the skull/xbones. What to change it to and what to feed it are the problem. |
| 15:43 |
Dyrcona |
mrpeters: Seems what is really needed is a generic dialog that parses the event information and displays something informative to the user. |
| 15:44 |
mrpeters |
yeah, i was hoping to get it to just throw up an error saying "The subordinate user cannot be merged with the lead because the user has been sent to collection agency" and the only way out was to say OK, which would then cancel merge |
| 15:45 |
mmorgan |
ok, vim is showing me the conflict, will see if I can fix |
| 15:46 |
kmlussier |
Bmagic: Unified volume/copy editor? |
| 15:46 |
kmlussier |
Bmagic: There's an existing bug on that |
| 15:47 |
kmlussier |
bug 1040686 |
| 15:47 |
pinesol_green |
Launchpad bug 1040686 in Evergreen "Unified editor shouldn't always delete volumes" (affected: 11, heat: 62) [Undecided,Confirmed] https://launchpad.net/bugs/1040686 |
| 15:48 |
Bmagic |
kmlussier: oh good! |
| 15:51 |
kmlussier |
@whocares vim |
| 15:51 |
pinesol_green |
csharp loves vim |
| 15:51 |
kmlussier |
@love vim |
| 15:51 |
pinesol_green |
kmlussier: The operation succeeded. kmlussier loves vim. |
| 15:52 |
mmorgan |
@love vim |
| 15:52 |
pinesol_green |
mmorgan: The operation succeeded. mmorgan loves vim. |
| 15:52 |
mrpeters |
throwing https://bugs.launchpad.net/evergreen/+bug/914800 back to unassigned...not going to be able to tackle this one today |
| 15:52 |
pinesol_green |
Launchpad bug 914800 in Evergreen "Attempting to merge user in collections provides an unfriendly error message" (affected: 3, heat: 18) [Low,Confirmed] |
| 15:57 |
mmorgan |
ok, git is telling me the conflict is resolved |
| 15:58 |
* mmorgan |
wishes she knew what she did! |
| 16:00 |
Dyrcona |
@meh vim |
| 16:00 |
pinesol_green |
Dyrcona: Message root @ server God....Universe going down for reboot.... |
| 16:11 |
kmlussier |
We have a few signed off bugs at http://bit.ly/11cbmGt for any core committer who may be looking for something to do. :) |
| 16:11 |
kmlussier |
Think of it as an easy way to get your name added to bit.ly/144v9IV |
| 16:11 |
kmlussier |
Or even to http://bit.ly/144v9IV |
| 16:15 |
pinesol_green |
[evergreen|Thomas Berezansky] Use xact_start for due date calc instead of now - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=2df5aff> |
| 16:17 |
pinesol_green |
[evergreen|Timothy Spindler] Docs: Documentation for MARC Batch Edit - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=e960b92> |
| 16:19 |
|
terran joined #evergreen |
| 16:21 |
Dyrcona |
At least one of those signed off bugs, should probably have the signed off tag removed. |
| 16:21 |
Dyrcona |
lp 1125567 specifically |
| 16:21 |
pinesol_green |
Launchpad bug 1125567 in Evergreen "Staff client doesn't sort patron's checked out items" (affected: 3, heat: 20) [Wishlist,Incomplete] https://launchpad.net/bugs/1125567 |
| 16:23 |
Dyrcona |
With all due respect to paxed and ktomita |
| 16:23 |
kmlussier |
Dyrcona: You're right. I'll remove the signedoff and pullrequest tags. |
| 16:23 |
kmlussier |
Done |
| 16:25 |
pinesol_green |
[evergreen|Yamil Suarez] Docs: remove extra '\r' in cataloging/MARC_batch_edit.txt - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=3e06e33> |
| 16:29 |
Stompro |
@love jove |
| 16:29 |
pinesol_green |
Stompro: The operation succeeded. Stompro loves jove. |
| 16:29 |
kmlussier |
What is jove? |
| 16:29 |
Dyrcona |
jove is a text editor. |
| 16:30 |
* Stompro |
saw all the vim love a little while back. |
| 16:31 |
Stompro |
(Jonathan's Own Version of Emacs) |
| 16:32 |
Dyrcona |
It's an Ersatz Emacs. :) |
| 16:33 |
Dyrcona |
@love gnu/emacs |
| 16:33 |
pinesol_green |
Dyrcona: The operation succeeded. Dyrcona loves gnu/emacs. |
| 16:33 |
bshum |
gmcharlt: All set for 2.7.1a (just updating the downloads page next) |
| 16:33 |
Dyrcona |
Really, any programmer will tell you that they love/hate their editor/IDE. |
| 16:34 |
bshum |
Set. |
| 16:34 |
gmcharlt |
bshum: ok, I'll do some publicity |
| 16:34 |
Dyrcona |
Go! |
| 16:34 |
Dyrcona |
Ready! |
| 16:34 |
gmcharlt |
Aim! |
| 16:35 |
Dyrcona |
It's in parallel.... ;) |
| 16:35 |
jboyer-isl |
But there’s a mutex! it’s right there! Do I have to do something else with it? |
| 16:36 |
kmlussier |
I'm heading home for the day, but I just want to send my thanks first to everyone who helped squash bugs today! |
| 16:36 |
Dyrcona |
jboyer-isl: You're using a PPC and you forgot to call eieio: Ensure Inline Execution of I/O. |
| 16:36 |
jboyer-isl |
The best instruction, obviously. |
| 16:38 |
mmorgan |
kmlussier++ |
| 16:38 |
jcamins |
Dyrcona: is that a real instruction? |
| 16:38 |
Dyrcona |
jcamins: Yes, it is. |
| 16:38 |
mmorgan |
one more squash - lp 829630 is "triaged", but no longer exists. What should it's status be? |
| 16:38 |
jboyer-isl |
The best part of multithreaded programming: all the extra opportunities to call |
| 16:38 |
pinesol_green |
Launchpad bug 829630 in Evergreen 2.4 "Holding maintenance bug when going from Item Status > View In Catalog > Holding Maintenance" (affected: 4, heat: 24) [Medium,Triaged] https://launchpad.net/bugs/829630 |
| 16:38 |
Stompro |
kmlussier++ |
| 16:38 |
jcamins |
Dyrcona: suddenly I regret the death of the PowerPC. |
| 16:39 |
kmlussier |
mmorgan: I usually use incomplete or invalid. |
| 16:39 |
kmlussier |
mmorgan: But maybe LP page on the wiki can give us some guidance. |
| 16:39 |
bshum |
kmlussier++ |
| 16:40 |
bshum |
I would go with "invalid" |
| 16:40 |
kmlussier |
Invalid I guess? http://wiki.evergreen-ils.org/doku.php?id=dev:bug_wrangler:faq |
| 16:40 |
bshum |
For something that is no longer a bug. |
| 16:40 |
Dyrcona |
I messed with the statuses. Tell me what you think. |
| 16:40 |
* bshum |
refreshes |
| 16:41 |
Dyrcona |
I set 2.3 and 2.4 to won't fix, unless you want to just remove the targets. |
| 16:41 |
bshum |
Looks reasonable to me. |
| 16:42 |
mmorgan |
Invalid it is! |
| 16:42 |
|
kbutler joined #evergreen |
| 17:12 |
pinesol_green |
Incoming from qatests: Test Failure - http://testing.evergreen-ils.org/~live/test.html <http://testing.evergreen-ils.org/~live/test.html> |
| 17:13 |
|
mmorgan left #evergreen |
| 17:21 |
|
nhilton_ joined #evergreen |
| 18:09 |
|
artunit joined #evergreen |
| 18:57 |
|
kmlussier joined #evergreen |
| 19:57 |
|
artunit joined #evergreen |
| 20:24 |
bshum |
Calling 0896 |
| 20:24 |
bshum |
And going with my gut feeling for bug 778989's final commit |
| 20:24 |
pinesol_green |
Launchpad bug 778989 in Evergreen "Owning lib of asset.copy_location not visible in Item Attributes Editor UI" (affected: 3, heat: 16) [Medium,Confirmed] https://launchpad.net/bugs/778989 |
| 20:33 |
pinesol_green |
[evergreen|Thomas Berezansky] LP#778989: Attempt to find "Correct" copy location - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=6e6540a> |
| 20:33 |
pinesol_green |
[evergreen|Thomas Berezansky] LP#778989: Add circ lib to location fixer - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=d38d0e7> |
| 20:33 |
pinesol_green |
[evergreen|Chris Sharp] LP#778989: Adding DROP TRIGGER IF EXISTS to allow for smooth upgrades. - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=99ea632> |
| 20:33 |
pinesol_green |
[evergreen|Ben Shum] LP#778989: Stamping upgrade script for copy location trigger - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=5df9600> |
| 20:34 |
kmlussier |
Yay! |
| 20:35 |
bshum |
kmlussier: Just FYI, I'm not planning to backport bug 1095290 |
| 20:35 |
pinesol_green |
Launchpad bug 1095290 in Evergreen 2.7 "Record navigation template has a translatable arrow" (affected: 1, heat: 6) [Undecided,New] https://launchpad.net/bugs/1095290 |
| 20:35 |
bshum |
Because it's a string change |
| 20:35 |
kmlussier |
OK, that works for me. |
| 20:35 |
pinesol_green |
[evergreen|Pasi Kallinen] LP#1095290: Wrap record navigation template next and previous arrows with spans. - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=321b1f9> |
| 20:36 |
* kmlussier |
wonders how long it will be before we finally get all of paxed's patches merged in. :) |
| 20:37 |
bshum |
paxed++ # still awesome :) |
| 20:39 |
kmlussier |
paxed++ indeed |
| 20:39 |
pinesol_green |
[evergreen|Bill Erickson] LP#1203734 copy circ counts include anon. circs - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=86a8e26> |
| 20:46 |
|
kmlussier left #evergreen |
| 20:47 |
|
kmlussier joined #evergreen |
| 20:49 |
|
mdriscoll1 joined #evergreen |
| 20:49 |
pinesol_green |
[evergreen|Liam Whalen] LP1282277 & LP1282286 MARC edit save warning & TCN search warning - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=e9de9d7> |
| 20:49 |
pinesol_green |
[evergreen|Liam Whalen] LP1282277 & LP1282286 Fixed error with Copy Editor - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=a4a1657> |
| 20:50 |
pinesol_green |
[evergreen|Liam Whalen] LP1282277 & LP1282286 Double call to MARC edit save fixed - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=15162f6> |
| 20:50 |
pinesol_green |
[evergreen|Liam Whalen] LP1282277_LP1282286_Unitialized_Vars_FIx - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=64fcd30> |
| 20:53 |
|
mmorgan1 joined #evergreen |
| 20:58 |
pinesol_green |
[evergreen|Thomas Berezansky] LP#1012308: Teach the staff client to use titlesort - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=b343d1c> |
| 20:59 |
bshum |
Calling 0897 |
| 21:06 |
pinesol_green |
[evergreen|Chris Sharp] LP#1391290: Respect setting to disable authority propagation on reingest - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=b72d5f6> |
| 21:06 |
pinesol_green |
[evergreen|Ben Shum] LP#1391290: Stamping upgrade script for authority reingest setting - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=afe883f> |
| 21:06 |
|
geoffsams joined #evergreen |
| 21:11 |
|
sarabee joined #evergreen |
| 21:22 |
pinesol_green |
[evergreen|Jason Etheridge] LP#1386260: DST bugs in perl live tests (03-overdue_circ.t) - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=af46860> |
| 21:22 |
pinesol_green |
[evergreen|Jason Etheridge] LP#1386260: DST bugs in perl live tests (04-overdue_with_closed_dates.t) - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=600b508> |
| 21:22 |
bshum |
Maybe now we'll have a happy live test again :) |
| 21:22 |
bshum |
phasefx++ |
| 21:24 |
|
kmlussier joined #evergreen |
| 21:37 |
|
artunit joined #evergreen |
| 21:40 |
pinesol_green |
[evergreen|Josh Stompro] LP#1133158 - Fix typos in action_trigger_runner.pl - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=ff79901> |
| 23:10 |
|
sarabee joined #evergreen |
| 23:21 |
|
sbrylander joined #evergreen |
