[05:30] <didrocks> good morning
[05:32] <duflu> Morning didrocks
[05:36] <didrocks> hey duflu
[06:31] <oSoMoN> good morning desktoppers
[06:32] <duflu> Hi oSoMoN
[06:38] <oSoMoN> hey duflu
[07:47] <marcustomlinson> morning all
[07:48] <Trevinho> morning all!
[07:54] <duflu> Morning marcustomlinson and Trevinho
[08:00] <willcooke> morning
[08:00] <willcooke> I thought it was Friday today
[08:01] <duflu> Morning willcooke
[08:35] <willcooke> Urgh.  28 in my office and it's only 0935
[08:49] <didrocks> willcooke: 28.8 here! But all closed since 8am
[08:49] <willcooke> :((((
[08:49] <didrocks> 3rd days it's 39-40 max outside
[08:50] <didrocks> still tomorrow and then, we are losing 10 degres on Saturday, finally
[09:05] <oSoMoN> willcooke, it definitely feels like a Friday
[09:06]  * didrocks can make it a Friday if you want :)
[09:08] <oSoMoN> shall I prepare a SRU for bug #1837437 ?
[09:21] <willcooke> oSoMoN, ooooh, yes please.  Thank you!
[10:10] <didrocks> xnox: hey, do you mind pushing your grub2 upload to the git branch? Thx!
[10:36] <didrocks> cyphermox: hum, our grub zfs patch was split in multiple patches, to mirror 10_linux split, with for instance ubuntu recovery in a separate patch and so on… It's not the case anymore, was that on purpose?
[10:40] <oSoMoN> willcooke, I attached a debdiff to the bug report, need someone to sponsor it
[10:40] <didrocks> also, some part staged in git has been removed and push -f with the merge
[10:41] <oSoMoN> I'll update the bug description to the SRU format in a moment
[10:43] <didrocks> the goal with to separate the upstreamable part with the ubuntu specific things, like in 10_linux, hence the split in 6 patches, but it's all lost now :/
[13:29] <xnox> didrocks999:  hmmmm yes....
[13:29] <xnox> didrocks999:  let me try to find it.
[13:31] <didrocks999> thx!
[13:31] <xnox> didrocks:  it uses that weird thing for patches right?
[13:31] <didrocks> xnox: git dpm yeah
[13:31] <didrocks> (which is better than gbp IMHO)
[13:32] <didrocks> having used both :p
[13:32] <xnox> didrocks:  but also abandoned and not maintained anymore
[13:32] <xnox> (or at least it was at one point)
[13:32]  * didrocks almost generalized that to most of tools we are using :)
[13:34] <markmorlino> Is this a good place to ask a gnome/gdm/greeter desktop login configuration question?
[13:35] <didrocks> markmorlino: this is more a developer channel, for support, it's more #ubuntu
[13:35] <markmorlino> thanks didrocks
[13:35] <didrocks> yw :)
[13:46] <xnox> didrocks:  git-dpm import-dsc generated 89 commits, which seems.... odd.... unless that is normal....
[13:47] <didrocks> xnox: hum, I think you need git dpm apply-patch rather, but cyphermox can confirm, he's using dpm more than I do
[14:55] <cyphermox> wat
[14:56] <cyphermox> didrocks: the undo of the split was on purpose, yes
[14:56] <cyphermox> it's easier for me to merge it that way, and we'll upstream everything (none of this is ubuntu specific)
[14:56] <cyphermox> xnox: you shouldn't need import-dsc? what were you trying to do?
[15:19] <didrocks> cyphermox: the patches like "recovery" and so on in 10_linux are ubuntu specific
[15:19] <didrocks> cyphermox: and we lost the staged changes
[15:20] <didrocks> like the awk -> shell rewrite
[15:20] <didrocks> sounds like a git push -f was done
[15:21] <didrocks> we did spend a long time splitting on purpose for maintainability and upstreamability, would have been good to talk before taking decision of flattening it
[15:21] <didrocks> and to be able to upstream, we'll have to split it back now
[15:21] <didrocks> (+ readd what was erased)
[15:23] <cyphermox> didrocks: I don't think so; it'll be fine, and I'll handle this myself
[15:23] <cyphermox> ie. some of it would actually be good to have in Debian anyway, modulo some very small pieces
[15:23] <cyphermox> so; what part was lost?
[15:24] <cyphermox> worst case, we can pick things back up from LP directly, the patches should apply cleanly if simply replaced by the old ones (ie. a rebase, I can do if necessary)
[15:25] <cyphermox> grub merges are no fun, I'm doing the best I can with the number of changes upstream, in debian, and our patches
[15:25] <didrocks> cyphermox: well, we plan to upstream most of it, but not the ubuntu specific part
[15:26] <didrocks> which is we the split
[15:26] <didrocks> the part that is lost are staged changes in the git repo
[15:26] <didrocks> which was removed, because git push -f
[15:26] <didrocks> (I guess)
[15:27] <cyphermox> well, yeah, but I disagree with the need to split to be able to upstream things, it's irrelevant when I'll be merging things upstream myself next week (I just need a quick pause from my move)
[15:27] <didrocks> we had a changelog describing the changes we introduced, which was:https://paste.ubuntu.com/p/sYWz4fBjtp/
[15:27] <didrocks> 4 days of work
[15:27] <didrocks> cyphermox: so, why do we have the 10_linux changes split?
[15:27] <didrocks> cyphermox: I guess it's either both are split, or either both are in a single patch
[15:28] <didrocks> and what about the change above? ^
[15:29] <cyphermox> let's back up for a sec
[15:29] <cyphermox> are the changes currently in eoan good?
[15:30] <didrocks> no
[15:30] <didrocks> they were only staged in the grub git repo
[15:30] <didrocks> to not screw up your merge
[15:31] <cyphermox> oh, you mean they were staged and not uploaded?
[15:31] <cyphermox> we might have been pushing right around the same moment; because what I uploaded was exactly what was in the archive
[15:32] <didrocks> cyphermox: the changes are staged in the git repo, I didn't upload them, it was in June
[15:32] <didrocks> and the git repo don't have them anymore
[15:32] <didrocks> (so not an upload clash, but a vcs erase)
[15:33] <cyphermox> why would you stage stuff in a git master branch and not task to people about it?
[15:34] <didrocks> cyphermox: we did talk about our zfs work
[15:34] <cyphermox> not to me.
[15:34] <didrocks> you were on the channel
[15:34] <cyphermox> anyway, I think I have a copy of it here.
[15:34] <didrocks> we talked about git dpm
[15:34] <didrocks> and why did you git push -f without looking what you are erasing?
[15:34] <didrocks> I mean, VCS are meant for this
[15:34] <cyphermox> you asked about git-dpm, I had no idea what you were working on
[15:34] <cyphermox> yeah, that's why we have branches
[15:34] <didrocks> well, it's ready to be uploaded
[15:35] <didrocks> but didn't worth an upload on itself to screw up your merge
[15:35] <didrocks> we tried to be nice with you, didn't think one seconde someone would do a git push -f
[15:35] <cyphermox> it wasn't clear to me that some things were staged and not uploaded, when there was something uploaded too (https://launchpad.net/ubuntu/+source/grub2/2.02+dfsg1-12ubuntu3)
[15:35] <cyphermox> I think I have a copy of the old stuff, one minute
[15:35] <didrocks> why do you git push -f ?
[15:35] <didrocks> ok
[15:36] <didrocks> at least, we can get it back
[15:36] <cyphermox> because merges are a pain and that's what I had to do
[15:36] <didrocks> well, maybe using a git dpm branch, if we can't avoid git push -f, isn't the right tool?
[15:38] <cyphermox> please, next time use a different branch than master/ubuntu if you're staging things somewhere to not interfere with people
[15:38] <cyphermox> I'll restore code in a branch called 'didrocks' if I have it, after our team meeting
[15:38] <didrocks> cyphermox: the thing was ready to upload
[15:38] <didrocks> so it shouldn't be a separate branch
[15:38] <didrocks> we just didn't want to add more work for your merge
[15:38] <didrocks> cyphermox: so please use a VCS and don't git push -f
[15:39] <cyphermox> didrocks: it *is* a vcs and I did as much as I could, and in this particular case, git push -f was the right thing to do.
[15:39] <cyphermox> errors and clash happen, let's see if we can't fix things now
[15:40] <didrocks> I strongly disagree that we can argue that git push -f is the right thing to do in any case
[15:40] <Laney> surely git revert, if anything; push -f is just a recipe for making life difficult for others
[15:40] <didrocks> but let's see if you can restore the branch and we'll spend the days to redo things
[15:40] <cyphermox> why would you have to redo anything?
[15:41] <didrocks> I need to recheck the changes in debian/patches, as in my branch, the content was split
[15:41] <cyphermox> with the original patches I can just drop / re-apply the right ones in a rebase
[15:41] <didrocks> so, I won't reapply all patches without looking at the diff
[15:41] <didrocks> and ensure we revert anything from your merge
[15:44] <cyphermox> this isn't complicated. I'll set you up with a 'didrocks*' branches, and then you can have a look if there's anything missing
[15:44] <didrocks> thx
[16:05] <oSoMoN> that's all folks, see ya all tomorrow
[16:37] <hggdh> on Eoan: is it expected that the new Chromium (snap) is installed, but I get a warning stating /snap/bin is not in my path? https://paste.ubuntu.com/p/8v58VDktfB/
[16:39] <hggdh> (and no request to logout/in or reboot?)
[16:39] <willcooke> hggdh, I think snaps are still broken on E
[16:39] <hggdh> ah
[16:39] <willcooke> hggdh, there was a kernel issue and perhaps also a seeding issues
[16:39] <hggdh> ok, so no need for a bug, I guess
[16:39] <willcooke> they're known and fixes are en route
[16:39] <willcooke> dont think so
[16:40] <willcooke> thanks for noticing
[16:40] <hggdh> yw. Thank you for the prompt response
[16:41] <willcooke> np
[16:44] <xnox> cyphermox:  trying to commit my manual upload of grub to the git-dpm repo
[17:15] <tkamppeter> Laney, hi
[17:34] <Laney> hello tkamppeter
[17:35] <Laney> not really around reliably this week
[17:35] <tkamppeter> Laney, I have solved the nm.py, see my merge request (and I have also fixed your inline remarks for the debuggability improvement part)
[17:36] <Laney> ok, will look when I get a chance
[17:36] <tkamppeter> Laney, could you have another look if you find some time? Thanks.
[17:47] <willcooke> night all