| === maclin1 is now known as maclin | ||
| === maclin1 is now known as maclin | ||
| duflu | Hi seb128 | 05:05 |
|---|---|---|
| === maclin1 is now known as maclin | ||
| didrocks | good morning | 06:29 |
| duflu | Hi didrocks | 06:33 |
| didrocks | hey duflu | 06:34 |
| === pstolowski|afk is now known as pstolowski | ||
| oSoMoN | good morning desktoppers | 07:22 |
| didrocks | salut oSoMoN, ça va ? | 07:23 |
| oSoMoN | didrocks, bien, et toi? | 07:24 |
| didrocks | ça va, pas mal de bruit avec les travaux de la toiture, mais bon, plus que 3 mois :p | 07:24 |
| duflu | Hey oSoMoN | 07:28 |
| oSoMoN | hey duflu | 07:29 |
| seb128 | hey duflu, didrocks, oSoMoN | 07:47 |
| seb128 | good morning desktopers | 07:47 |
| duflu | Morning seb128 | 07:47 |
| seb128 | duflu, sorry for not replying earlier, I was up quite early but only dealt with email and didn't start on IRC, just started it to have the backlog | 07:48 |
| seb128 | how is everyone today? | 07:48 |
| didrocks | salut seb128, ça va ? | 07:48 |
| oSoMoN | salut seb128 | 07:48 |
| seb128 | didrocks, ouais, levé un peu avant 6h30 mais sinon ça va :) | 07:48 |
| duflu | seb128, no problem. It was obvious to me it was too early in the day | 07:48 |
| didrocks | seb128: argh ;) | 07:49 |
| seb128 | hehe | 07:49 |
| seb128 | obvious to everyone but 1 that 6:30am is not a time to get up :p | 07:49 |
| seb128 | I stop complaining though, not next to oSoMoN who probably doesn't have proper nights at all atm | 07:50 |
| didrocks | and he's the one deciding! | 07:50 |
| didrocks | :) | 07:50 |
| seb128 | yeah :) | 07:50 |
| didrocks | big merge done: https://github.com/ubuntu/communitheme! :) | 07:51 |
| didrocks | now, preparing the secret renaming :p | 07:51 |
| oSoMoN | yeah, many wakeups throughout the night, but hey, that's how things go with babies | 07:51 |
| Laney | ello | 08:02 |
| seb128 | hey Laney, happy mid-week-day! | 08:03 |
| seb128 | how are you? | 08:03 |
| duflu | seb128, often called hump day, because it's the middle and the week is a hill. Not for other reasons | 08:07 |
| duflu | Morning Laney | 08:07 |
| seb128 | haha | 08:08 |
| * duflu wonders if that's just an Australian term | 08:09 | |
| Laney | new one to me | 08:10 |
| duflu | Nope. It's American | 08:10 |
| Laney | hey seb128 & duflu | 08:10 |
| didrocks | hey Laney | 08:10 |
| Laney | & didrocks! | 08:10 |
| Laney | well done on the merge | 08:10 |
| * tsimonq2 waves | 08:12 | |
| tsimonq2 | Was anything ever done with popcon? | 08:13 |
| tsimonq2 | https://popcon.ubuntu.com/ <-- I see this is now enabled. | 08:13 |
| tsimonq2 | Er, runnign | 08:13 |
| Laney | seb128: I'm good, nothing special going on, you? | 08:13 |
| seb128 | tsimonq2, "done"? | 08:14 |
| seb128 | that website has existed for years, probably like 10 years ? | 08:15 |
| seb128 | seems #is fixed it to update again if that's what you mean | 08:15 |
| tsimonq2 | Ah. | 08:15 |
| tsimonq2 | seb128: I thought I remembered hearing that we were doing to make that opt-out as well as part of the metrics? | 08:16 |
| seb128 | Laney, I'm good, I played tennis yesterday evening, was great fun. The weather was perfect and the match was exhausting but followed by a beer well deserved :) | 08:16 |
| seb128 | tsimonq2, we were discussing on whether popcon would provide useful info and decided that not so we didn't include it in the metrics etc | 08:17 |
| seb128 | so no, it's not enabled by default not being used in any new way | 08:17 |
| seb128 | nor* | 08:17 |
| Laney | seb128: caña? | 08:17 |
| seb128 | sí! | 08:18 |
| rbalint | Laney, could we discuss LP: #1775226 ? | 08:18 |
| ubot5 | Launchpad bug 1775226 in gnome-software (Ubuntu) "Gnome Software offers installation of updates on shutdown independently from update-manager and unattended-upgrades" [Undecided,New] https://launchpad.net/bugs/1775226 | 08:18 |
| seb128 | rbalint, that's a bug/not expected | 08:18 |
| seb128 | I saw that a few times during the bionic dev cycle but not since | 08:18 |
| didrocks | thanks Laney! I'm doing all the rest of paperwork, like adaptin Travis, gtk-common-themes and some cleanup still… | 08:19 |
| rbalint | seb128, it is causing many reports on errors.ubuntu.com | 08:19 |
| seb128 | you mean? | 08:19 |
| seb128 | what component is hitting what error? | 08:19 |
| seb128 | can you give an example? | 08:19 |
| tsimonq2 | seb128: ACK, thanks. | 08:20 |
| seb128 | tsimonq2, yw! | 08:20 |
| Laney | rbalint: I'm not the right person to discuss this with you anyway, it's not me working on this stuff | 08:23 |
| Laney | seb's right though, it's disabled in gnome-software | 08:23 |
| Laney | (I happen to think that we should do upgrades in there and work to get rid of update-manager, but it's not my area so that is not particularly my call) | 08:24 |
| rbalint | seb128, unattended-upgrades skips upgrading packages where changed config files would trigger questions to the user, while gnome-sw tries upgrading in the background and may end up being stuck | 08:24 |
| rbalint | this happens when installing packages during shutdown | 08:24 |
| rbalint | Laney, seb128 ok, let me check again if this is disabled, i faced the problem earlier | 08:25 |
| seb128 | rbalint, I don't understand the "where changed config files would trigger questions to the user" part ... you mean unattended-upgrades skips packages with conffile changes? how does that has to do with the gnome-software issue, seems orthogonal to me? | 08:26 |
| rbalint | u-u does not end up in a half-upgraded system, while gnome-sw does when operating during shutdown | 08:27 |
| seb128 | are you trying to argue that we should let u-u do the job? | 08:28 |
| rbalint | so it may make sense to disable the which may break something | 08:28 |
| rbalint | seb128, yes | 08:28 |
| Laney | It is disabled | 08:28 |
| seb128 | you don't need that part of the discussion | 08:28 |
| seb128 | that's the intend | 08:28 |
| seb128 | we are not doing packagekig/g-s offline updates in Ubuntu | 08:28 |
| seb128 | you getting that UI is neither standard nor wanted, it's a bug | 08:29 |
| seb128 | let's just focus on why you get it | 08:29 |
| seb128 | no need to convince anyone that it's a bug or wrong :) | 08:29 |
| seb128 | Laney, do you know how it's enabled/disabled? | 08:29 |
| seb128 | or where | 08:29 |
| seb128 | Robert would probably be our default goto person, but he's off until the end of the month | 08:30 |
| seb128 | (and also wouldn't be online at this time anyway) | 08:30 |
| Laney | a patch I think | 08:31 |
| rbalint | seb128, ok regarding reproduction i just installed bionic in a vm and i saw the screen attached to the bug after one day | 08:31 |
| rbalint | seb128, Laney: thanks i'll follow up in the bug | 08:33 |
| seb128 | rbalint, I saw that dialog a few time in the bionic cycle so I believe there is a bug that might make it displayed, nobody else in the team reported seeing it though and we didn't get user reports about it so I don't know how common it is | 08:34 |
| seb128 | rbalint, what sort of numbers are we talking about for those e.u.c reports you mentioned, and are you sure they are a direct consequence of that problem? | 08:35 |
| seb128 | rbalint, I'm asking that to have an idea of what priority we should put on the issue | 08:36 |
| Trevinho | Morning! 👀 | 08:37 |
| duflu | Hi Trevinho | 08:38 |
| seb128 | hey Trevinho, how are you? | 08:38 |
| Trevinho | Hi duflu | 08:38 |
| Trevinho | seb128: all good, you? | 08:38 |
| seb128 | I'm good thanks | 08:39 |
| seb128 | rbalint, what does "systemctl status packagekit-offline-update.service" says? | 08:39 |
| rbalint | seb128, inactive (dead) | 08:40 |
| rbalint | seb128, regarding the priority we have a lot of reports where u-u loses the lock to an other apt frontend and that could be gnome-sw https://errors.ubuntu.com/?package=unattended-upgrades&period=week | 08:42 |
| rbalint | seb128, i'm about to fix that in bionic with | 08:43 |
| rbalint | the next upload SRU at least partially | 08:43 |
| Trevinho | Laney: morninggs... | 08:46 |
| Trevinho | And didrocks too :) | 08:46 |
| Trevinho | I wanted ask you guys how we handle the case when we do upstream imports on gbp before than debian.... | 08:46 |
| Trevinho | like: a pkg version is imported in ubuntu, but not yet debian... So that will generate an upstream/x.y.z tag, but if and when debian decides to create that too, then our tag will be overwritten no? | 08:47 |
| Trevinho | so maybe that situation should use different tag naming schema or what? | 08:48 |
| seb128 | rbalint, do you have a file "/var/lib/PackageKit/prepared-update"? | 08:48 |
| Laney | hi Trevinho | 08:48 |
| Trevinho | In case we're not in sync with debian and we need to import is easy, it's just about merging it, but if we're the 1st ones? | 08:48 |
| Trevinho | Now, I know the best case would be fixing salsa... | 08:49 |
| Laney | if you do that, you can push the tag back to salsa | 08:49 |
| Trevinho | but... let's assume the generic case, or imagine either another debian-based distro, what should do? | 08:49 |
| Laney | otherwise keep our one | 08:49 |
| Laney | even if you merge, you'll get the commit from salsa with the right parents | 08:49 |
| Trevinho | won't that create conflicts? | 08:50 |
| Trevinho | I mean, having in two remotes the same tag with different sha? | 08:50 |
| seb128 | Trevinho, btw I don't know how to "fix" the gnome-control-center git, I had to do an udate/upload out of the vcs during GUADEC so content differs :/ | 08:50 |
| seb128 | I guess I'm just going to do another commit with the diff | 08:51 |
| Trevinho | seb128: I can fix it if you want | 08:51 |
| seb128 | and forget about tagging since there is not going to be a vcs state that corresponds to the update | 08:51 |
| seb128 | Trevinho, if you want that would be nice | 08:51 |
| Trevinho | ok | 08:51 |
| Laney | seb128: had to? | 08:52 |
| seb128 | I tried to update the vcs but gbp import-orig would fail because the pristine-tar branch was not having the current version or something | 08:52 |
| Trevinho | :) | 08:52 |
| seb128 | Laney, ^ | 08:52 |
| Laney | I mean we probably could have fixed whatever the problem was | 08:52 |
| seb128 | right, but everybody was travelling | 08:52 |
| seb128 | and I needed to get that SRU out | 08:52 |
| seb128 | .1 schedule etc | 08:52 |
| Trevinho | seb128: you can update the pristine-tar in that case | 08:52 |
| Trevinho | push to ubuntu and then PR to debian | 08:53 |
| Trevinho | then/together with | 08:53 |
| seb128 | but Debian did the update first | 08:53 |
| seb128 | and didn't have the pristine-tar updated | 08:53 |
| seb128 | I just don't understand git enough to deal with all those cases | 08:53 |
| seb128 | I tried to follow the documentation but just hit fails on fails | 08:54 |
| Trevinho | ok, I see... more than git itself debian-git way is just another sub-world :) | 08:54 |
| seb128 | anyway, that's not important, I'm eventually going to learn to deal with the complexity of the system | 08:54 |
| seb128 | but as said, people were travelling and I needed that SRU out | 08:54 |
| seb128 | so sorry, took the easy way | 08:54 |
| Trevinho | mh, also gnome-software has some new patches I think mhmhm | 08:55 |
| Trevinho | Laney: let me fix those, then please push the "replace-everything" thing :) | 08:55 |
| Trevinho | to bzr | 08:55 |
| Trevinho | seb128: you didn't push that to bzr either, right? | 08:55 |
| seb128 | no, I tried to do it the right way | 08:56 |
| seb128 | using the new system | 08:56 |
| seb128 | I'm just not smart enough to deal with it :p | 08:56 |
| Trevinho | shut up :) | 08:56 |
| Laney | :/ | 08:56 |
| Trevinho | you're way smarter | 08:56 |
| seb128 | sorry, I should stop trolling | 08:57 |
| seb128 | it just requires learning, I'm not used to it and don't understand the details of the workflow | 08:57 |
| seb128 | so I couldn't hack my way about easily | 08:57 |
| Trevinho | just with time one tends to be lazy in learning new things. But once you get them you'll say "oh... but this is cool, I see why people love it" :-D | 08:57 |
| Trevinho | Laney: also you've merged all the https://code.launchpad.net/~canonical-desktop-team/+git, right? | 08:59 |
| Laney | yes | 08:59 |
| Trevinho | so i can proceed with the removal | 08:59 |
| Trevinho | coolio | 08:59 |
| Laney | debian had the commits for gnome-control-center 3.28.2, the required step was to pull from there | 09:03 |
| seb128 | isn't "gbp pull" supposed to do that? | 09:05 |
| Trevinho | yeah, as I did for nautilus I guess... if you import-orig ant the tag is already there. That's what is needed | 09:05 |
| Trevinho | however the git doc doesn't mention it | 09:05 |
| Trevinho | Laney, seb128: i've also prepared the bionic branch for https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus check if it's rigth and please import | 09:05 |
| seb128 | how do one "pull from Debian"? | 09:05 |
| seb128 | it's just over my head those details atm :/ | 09:05 |
| Trevinho | seb128: git merge upstream/fooo.bar no? | 09:05 |
| seb128 | I usually try to git pull and in this case tried to gbp pull | 09:05 |
| seb128 | Trevinho, so we are supposed to manually merge branches from debian first to make sure we are uptodate because doing an update on our side? | 09:06 |
| seb128 | not easy "update everything I need" wrapper maybe? ;) | 09:06 |
| tsimonq2 | ricotz: I noticed you subscribed ~ubuntu-sponsors to bug 1782122 but there's no debdiff attached... did you plan on attaching something, did you not have something, or is it already handled? | 10:38 |
| ubot5 | bug 1782122 in vala (Ubuntu) "[SRU] Update vala in bionic to 0.40.8" [Undecided,New] https://launchpad.net/bugs/1782122 | 10:38 |
| ricotz | tsimonq2, hi, I am currently waiting for it to be sponsored to debian and then synced to cosmic | 10:39 |
| tsimonq2 | ricotz: OK. Mind if I unsubscribe sponsors until it's ready? | 10:40 |
| ricotz | attaching such a huge debdiff seems not reasonable, of course I can add add a link to an existing build | 10:41 |
| ricotz | tsimonq2, I was hoping to receive some positive feedback first | 10:41 |
| tsimonq2 | OK | 10:41 |
| seb128 | Trevinho, so I tried again following your pastebin, on a fresh checkout of g-c-c if I do gbp import-dsc of gnome-control-center_3.28.2-0ubuntu1.dsc the status becomes "Your branch is ahead of 'origin/ubuntu/master' by 11908 commits." | 10:41 |
| ricotz | maybe replace ubuntu-sponsers with ubuntu-desktop | 10:41 |
| tsimonq2 | ricotz: I'll do that. | 10:42 |
| tsimonq2 | Thanks. | 10:42 |
| tsimonq2 | . | 10:42 |
| seb128 | Trevinho, I don't really understand what's going on :/ | 10:42 |
| ricotz | oSoMoN, hi, libreoffice 6.0.6~rc1 builds fine on current cosmic-proposed | 10:43 |
| ricotz | I am about to push a rebuild of 6.0.5~rc2 which could be picked up for cosmic? | 10:44 |
| tsimonq2 | ricotz: I poked oSoMoN a week or two ago but it would be good to get 6.1.0~rc1 in Cosmic so we can close the Qt 4 removal bug for it. | 10:46 |
| tsimonq2 | I don't know how it relates but I figured I should mention it :) | 10:46 |
| ricotz | tsimonq2, I planned to take a look at 6.1.0~rc2 this week | 10:47 |
| tsimonq2 | OK, great :) | 10:47 |
| ricotz | not sure about the state of the qt5 gui | 10:47 |
| ricotz | otherwise this means to drop the kde support | 10:47 |
| tsimonq2 | What do you mean? | 10:48 |
| ricotz | you want the qt4 dep to be gone, so I assume using qt5 is the way, but I am not sure its upstream support | 10:50 |
| ricotz | oSoMoN, using 6.0.6~rc1 directly won't hurt though | 10:50 |
| tsimonq2 | ah | 10:51 |
| tsimonq2 | ricotz: ftr Debian has libreoffice-kde5 ready to go in Experimental. | 10:51 |
| ricotz | right | 10:51 |
| tsimonq2 | So I believe it might be close to ready if not ready | 10:51 |
| oSoMoN | ricotz, a rebuild of 6.0.5 for cosmic would be welcome indeed | 10:51 |
| ricotz | oSoMoN, https://launchpad.net/~libreoffice/+archive/ubuntu/libreoffice-prereleases/+sourcepub/9263251/+listing-archive-extra | 10:52 |
| ricotz | oSoMoN, or wait for https://launchpad.net/~libreoffice/+archive/ubuntu/ppa/+sourcepub/9265457/+listing-archive-extra | 10:52 |
| ricotz | should build fine too, but if icu 61 is on its way too then 6.0.6 is better | 10:53 |
| oSoMoN | ack, thanks | 10:55 |
| rbalint | seb128, thanks for the help with the gnome-software bug! | 11:00 |
| seb128 | rbalint, yw, thanks for finding the action to trigger it | 11:02 |
| seb128 | at least it's not every install doing it by default | 11:02 |
| seb128 | :) | 11:02 |
| === pstolowski is now known as pstolowski|lunch | ||
| willcooke | morning all | 12:08 |
| === abeato_ is now known as abeato | ||
| oSoMoN | good morning willcooke | 12:16 |
| seb128 | hey willcooke | 12:16 |
| === pstolowski|lunch is now known as pstolowski | ||
| andyrock | seb128: Trevinho nautilus branch approved | 12:28 |
| seb128 | andyrock, hey, thanks | 12:28 |
| andyrock | the history was a bit corrupted yeasterday, the one of today was easier to review | 12:28 |
| seb128 | andyrock, Trevinho, I think the comment from Amr makes sense though | 12:28 |
| seb128 | we should undo those reverts | 12:28 |
| seb128 | but that's for Trevinho :) | 12:28 |
| Trevinho | seb128: I thought about that... We can te-revert ubuntu side | 12:29 |
| seb128 | +1 | 12:30 |
| Trevinho | Ok, I'll do | 12:30 |
| seb128 | thx | 12:30 |
| Trevinho | Unfortunately Carlos today has to do with rehl so no release for now | 12:30 |
| Trevinho | Let's wait a bit more | 12:30 |
| seb128 | right | 12:31 |
| seb128 | we don't need to block on that | 12:31 |
| === ondra_ is now known as ondra | ||
| Laney | are you asking for a release? | 12:34 |
| Laney | if so[B[B[Bcould help by preparing it in a erge request maybe | 12:34 |
| Laney | whtat's wrong with the wifi :( | 12:34 |
| seb128 | Laney, you mean https://gitlab.gnome.org/GNOME/nautilus/merge_requests/269 ? ;) | 12:35 |
| gitlab-bot | GNOME issue (Merge request) 269 in nautilus "Prepare gnome-3-26 branch for 3.26.4 release" (comments: 0) [Opened] | 12:35 |
| seb128 | Trevinho is de man :) | 12:36 |
| Laney | depends if that has a tag and NEWS and stuff | 12:36 |
| seb128 | yeah, I guess that could be added on top of the backports | 12:37 |
| Laney | :3 | 12:38 |
| seb128 | Laney, btw did you change the g-c-c vcs in launchpad eazrlier? I don't understand why that import-dsc workflow was giving me weird results earlier and now it tells me I'm 18 commits ahead which looks fine, I'm pretty sure I did the same step, I don't understand why the outcome is different :/ | 12:38 |
| Laney | Trevinho PMed me with some things to push | 12:38 |
| seb128 | k, maybe that was it | 12:38 |
| seb128 | anyway thanks to whoever "fixed" it | 12:39 |
| Laney | he did the merge of the dscs yeah | 12:39 |
| Laney | so it should reflect the archive now | 12:39 |
| Laney | the ubuntu/master thing was a bit more complicated since there were some staged changes in that branch that missed the upload | 12:39 |
| Trevinho | Yeah after tapas though | 12:39 |
| Laney | so they had to be re-applied | 12:39 |
| seb128 | right, that's where he took it over from me :p | 12:40 |
| seb128 | at least I played with the import-dsc and that's a nice workflow | 12:40 |
| seb128 | Trevinho, enjoy! | 12:40 |
| Laney | it looked like - make branch from previous upload (identical to archive) | 12:40 |
| Laney | - import dsc onto this branch | 12:40 |
| Laney | - switch back to master and merge, resolve conflict in changelog | 12:40 |
| seb128 | I see | 12:41 |
| seb128 | good to know for next time | 12:41 |
| Laney | nod | 12:41 |
| Laney | would have been more or less the same in bzr | 12:41 |
| seb128 | yeah, probably | 12:42 |
| Laney | bzr branch -r tag:<ubuntu version> ubuntu archive-upload; cd archive-upload; bzr import-dsc ..; cd ../ubuntu; bzr merge ../archive-upload | 12:42 |
| seb128 | bzr doesn't have proper concept of cherry picking commits or sharing revisions though I think | 12:42 |
| Laney | I think it would have known where they diverged | 12:43 |
| Laney | but indeed not as rich | 12:43 |
| seb128 | I wouldn't have bothered with the vcs under bzr, I would just have applied the debdiff on top of the current vcs and resolved the changelog/commited | 12:43 |
| Laney | nod | 12:43 |
| seb128 | Trevinho, Laney, what was the staged change in g-c-c? doing a diff between cosmic and the vcs doesn't show any diff (unless I did something wrong) | 13:40 |
| seb128 | didrocks, also you reverted a change from robert in g-c-c 1d41da82 to d/p/70_sound... that seems an error? | 13:41 |
| didrocks | seb128: oh, could be, let me look | 13:41 |
| seb128 | thx | 13:42 |
| didrocks | was it something in a package or staged? | 13:42 |
| didrocks | ah, in the import | 13:42 |
| didrocks | do you know what was the committed that was reverted? | 13:42 |
| didrocks | if not, no worry, I can have a look, it's just if you looked at it already… | 13:43 |
| didrocks | you are talking about https://bazaar.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu/revision/831 N | 13:44 |
| didrocks | ? | 13:44 |
| seb128 | didrocks, 924f7468 | 13:45 |
| didrocks | this commit is from Thu Jun 28 | 13:46 |
| didrocks | so, after 1d41da82 which is at the end of May? | 13:46 |
| seb128 | right, it was staged but never uploaded | 13:46 |
| * didrocks doesn't follow the "revert" | 13:46 | |
| seb128 | it git log 1d41da82 is "newer" | 13:47 |
| * seb128 gets confused by git again | 13:47 | |
| seb128 | hum | 13:48 |
| seb128 | Commité par : Marco Trevisan (Treviño) <marco@ubuntu.com> | 13:48 |
| seb128 | 02/07/2018 15:08:11 +0200 | 13:48 |
| seb128 | according to gitg | 13:48 |
| seb128 | so screwup in Trevinho's import? | 13:49 |
| didrocks | what? did Marco redid all branches, even the one we converted already? | 13:49 |
| didrocks | :/ | 13:49 |
| Trevinho | didrocks: no we just merged in the history | 13:49 |
| didrocks | if reimporting without looking via a script, and as told, that screw up new commits in bzr… :/ | 13:49 |
| didrocks | let me open d/p/70_sound | 13:49 |
| Trevinho | there were merge commits but no diff in these | 13:49 |
| didrocks | oki | 13:49 |
| seb128 | I don't understand, the g_clear_object calls are missing | 13:50 |
| didrocks | so, there shouldn't be an issue | 13:50 |
| didrocks | ah, it's missing? | 13:50 |
| didrocks | that's what I was going to ask | 13:50 |
| didrocks | Trevinho: you are the commiter for my commit | 13:50 |
| seb128 | unless I'm looking at the wrong file | 13:50 |
| didrocks | so you didn't just remerge… | 13:50 |
| Trevinho | what are you guys working on? wasn't the ubuntu/master I pushed in lp:~3v1n0 enough? | 13:51 |
| Trevinho | this I mean https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-control-center?h=ubuntu%2Fmaster | 13:51 |
| seb128 | Trevinho, I'm trying to figure out what's the deal for https://launchpad.net/bugs/1779051 | 13:52 |
| ubot5 | Ubuntu bug 1779051 in gnome-control-center (Ubuntu Bionic) "/usr/bin/gnome-control-center:11:gtk_container_remove:update_output_settings:on_amplify_changed:g_closure_invoke:signal_emit_unlocked_R" [Medium,Triaged] | 13:52 |
| seb128 | Trevinho, git show 924f7468 was the change from Robert | 13:52 |
| seb128 | Trevinho, but seems it vanished/isn't in master | 13:53 |
| didrocks | seb128: my theory is that it's been reimported and not just remerge | 13:54 |
| didrocks | otherwise, my "merge" commit ID would have myself as author and committer | 13:54 |
| didrocks | and author is still me, but committer is Trevinho | 13:54 |
| Laney | there has been no force push | 13:55 |
| * didrocks is puzzled | 13:55 | |
| didrocks | why am I the author of that commit? is that remerging on a branch which used the import script? | 13:56 |
| didrocks | (and so erased latest from the bzr branch) | 13:56 |
| Laney | it's gbp import-dsc | 13:59 |
| Laney | git diff 1d34a8d555e5c2c92a47c920d312c00d349addb9..1d41da82292f5d4f329a2720a54194fbd9ae4607 -- debian/patches/70_allow_sound_above_100.patch | 13:59 |
| Laney | that reconciled the branch to the state of the package and trashed the staged changed | 13:59 |
| Laney | s/d$// | 13:59 |
| seb128 | that command is not to be used on a non released commit it seems? | 14:00 |
| didrocks | correct, but that staged changes didn't exist at the end of may (date of the commit) | 14:00 |
| seb128 | that's basically the case we were talking about earlier? | 14:00 |
| didrocks | so, someone else reimported it twice? | 14:00 |
| Laney | can't understand what you're saying, sorry | 14:00 |
| Laney | seb128: it is | 14:00 |
| didrocks | well | 14:01 |
| didrocks | the "reverted commit" is after my import from a date perspective | 14:01 |
| Laney | it sets the date to the date from the changelog | 14:01 |
| didrocks | interesting, I'm still puzzled why I'm the Author and not Committer for it if nothing was changed on that branch | 14:02 |
| Laney | that's nice in this case | 14:02 |
| Laney | it shows that Trevinho messed up something you did :-) | 14:02 |
| didrocks | yeah, I still don't understand why there is no conflict when pulling though | 14:03 |
| Laney | not sure why there would be | 14:03 |
| Laney | it's just merge commits added on top | 14:03 |
| Trevinho | it's weird that merging the branches there was no diff, no? | 14:04 |
| Laney | if you diffed to the archive that won't show a dropped staged change | 14:04 |
| Laney | you need to diff to a package built from bzr | 14:04 |
| Laney | didrocks: if you use something which can show you the graph (git log --oneline --graph or giggle) it makes more sense | 14:07 |
| Laney | the linear history is kind of broken with all this complex stuff :/ | 14:07 |
| Trevinho | Mh I see, just in theory I reimported all these commits added after, it worked for g-s nautilus and ohters | 14:11 |
| Laney | looks like it happened out of order this time | 14:12 |
| Trevinho | Laney: ah I noticed you didn't merge vte yet, right? | 14:15 |
| Trevinho | Laney: https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/vte2.91/+git/vte2.91/+merge/348850 | 14:15 |
| Laney | dunno | 14:15 |
| Laney | lemme see | 14:16 |
| seb128 | Trevinho, I'm unsure to understand where it went wrong in with g-c-c and that commit from Robert but can you restore that change? thx! | 14:17 |
| Trevinho | seb128: ok | 14:17 |
| seb128 | thx | 14:17 |
| Laney | indeed, done | 14:17 |
| seb128 | and while you guys are hot on git, extra questions | 14:17 |
| * Trevinho in these moments wish had the ~ubuntu-desktop powers :-D | 14:17 | |
| seb128 | I did a gbp import-orig for a new GNOME tarball | 14:17 |
| Trevinho | You guys vote... now! :-D | 14:18 |
| seb128 | now | 14:18 |
| seb128 | $ git status | 14:18 |
| seb128 | On branch ubuntu/master | 14:18 |
| seb128 | Your branch is ahead of 'origin/ubuntu/master' by 7 commits. | 14:18 |
| Trevinho | -1's coming | 14:18 |
| seb128 | lol | 14:18 |
| seb128 | how do I see which ones those 7 are? | 14:18 |
| Trevinho | git diff origin/ubuntu/master ? | 14:18 |
| seb128 | is that just the first 7 in git log? | 14:18 |
| Trevinho | the list of commits? | 14:18 |
| seb128 | that's linear? | 14:18 |
| Trevinho | I've a git missing command too | 14:19 |
| Trevinho | which is... | 14:19 |
| Trevinho | I gave you my gitrc | 14:19 |
| seb128 | right | 14:19 |
| didrocks | everyone has a git missing command :) | 14:19 |
| didrocks | $ git help missing | 14:19 |
| didrocks | 'missing' est un alias de 'log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative' | 14:19 |
| seb128 | trying to just get those concept sticking | 14:19 |
| Laney | not me | 14:19 |
| seb128 | haha | 14:19 |
| Laney | :( | 14:19 |
| didrocks | Laney: create the alias above ^ | 14:19 |
| Laney | what am I *missing* out on | 14:19 |
| didrocks | :) | 14:20 |
| Trevinho | is something like a diff history thing :-D | 14:20 |
| Trevinho | never learned the full one | 14:20 |
| didrocks | well, do you want to learn the full one above? ^ | 14:20 |
| Trevinho | I've some around, check this there might be some useful https://pastebin.ubuntu.com/p/bFN3cfWRMn/ | 14:21 |
| Trevinho | like seb you loved bzr uncommit, there's one :) | 14:21 |
| Trevinho | instead of rebasing manually | 14:22 |
| tsimonq2 | Holy aliases | 14:22 |
| didrocks | uncommit alias :p | 14:22 |
| seb128 | :) | 14:23 |
| Laney | 😳 | 14:24 |
| tsimonq2 | Mine doesn't have nearly as many: http://paste.ubuntu.com/p/Y6c7pFK5NV/ | 14:24 |
| seb128 | Trevinho, that list of aliases by itself speaks for git being easy :p | 14:25 |
| * Laney votes for not having a git show off how complex you can make it contest | 14:25 | |
| tsimonq2 | bah | 14:25 |
| * Laney has 0 aliases :< | 14:25 | |
| tsimonq2 | Like I said, the other direction's where it's at | 14:25 |
| tsimonq2 | No aliases is <3 | 14:25 |
| Trevinho | seb128: can be even longer, but also I have problems with memorizing names, so something might not enter my head for ever | 14:25 |
| Trevinho | like... to learn gbp pq I took like 2 months :-D | 14:26 |
| Trevinho | it's just wrong naming! | 14:26 |
| seb128 | :) | 14:26 |
| seb128 | I've difficulties with "gbp" | 14:26 |
| Trevinho | Laney: looooser, 0 aliasases... loooooser | 14:26 |
| seb128 | I keep typing "gpb" | 14:26 |
| seb128 | or "gdb" :p | 14:26 |
| didrocks | seb128: welcome to the club! | 14:26 |
| Trevinho | I do the same | 14:26 |
| Trevinho | In fact.... | 14:26 |
| Trevinho | git pq :-D | 14:26 |
| Trevinho | alias | 14:26 |
| Trevinho | easier | 14:26 |
| seb128 | :) | 14:26 |
| tsimonq2 | pffft | 14:26 |
| tsimonq2 | :D | 14:27 |
| Laney | not really correct though | 14:27 |
| Laney | try to use it on a non gbp repository | 14:27 |
| Laney | you're going to have a bad day | 14:27 |
| Trevinho | well, indeed... but well I know what I type | 14:28 |
| Trevinho | or no :-D | 14:28 |
| tsimonq2 | When it doubt, always git push --force && git push origin :master | 14:28 |
| Trevinho | but just gbp pq is to much | 14:28 |
| Laney | speaking of bad days, looks like gtk 3.23.0 is missing a header | 14:28 |
| tsimonq2 | >:P | 14:28 |
| didrocks | Laney: catch it back: http://www.scienceshopping.com/media/catalog/product/cache/1/image/650x/040ec09b1e35df139433887a97daa66f/f/i/filet-a-papillon.jpg | 14:29 |
| seb128 | k, so one workflow question and I'm good for today | 14:30 |
| seb128 | when updating to a new version | 14:30 |
| seb128 | I did a gbp import-orig | 14:30 |
| didrocks | seb128: you have spend your credits for the day though :p | 14:30 |
| seb128 | lol | 14:30 |
| seb128 | now I dch/commit the changelog with tags directly? | 14:30 |
| seb128 | or do a changelog update UNRELEASED commit | 14:30 |
| seb128 | followed by a dch -R/debcommit -r ? | 14:31 |
| didrocks | I think an UNRELEASED commit makes sense, it's when you add more stuff like adapating patches if needed | 14:31 |
| didrocks | seb128: remember, releasing a package: https://wiki.ubuntu.com/DesktopTeam/git#Release_a_package | 14:31 |
| didrocks | (because of tagging, no debcommit -r :/) | 14:32 |
| seb128 | didrocks, that's what I'm reading, the "dch -r ""' changed the existing changelog entry from the previous archive upload though :p | 14:32 |
| didrocks | yeah, hence a UNRELEASED commit after important | 14:32 |
| didrocks | importing* | 14:32 |
| seb128 | so I had to revert | 14:32 |
| didrocks | please add it to the wiki if missing (it can be missing) | 14:32 |
| didrocks | I like unrelease commit for just importing | 14:33 |
| seb128 | will do (and yes it's missing) | 14:33 |
| didrocks | then more commits for fixing patches | 14:33 |
| didrocks | and then releasing in a separate commit | 14:33 |
| seb128 | well gbp import-orig commits the update without touching the changelog | 14:33 |
| seb128 | which I'm unsure is right, but I'm not going to discuss that today | 14:33 |
| seb128 | ideally that would automatically add a new entry matching the new version | 14:34 |
| Trevinho | Laney: also gdm was missing, but I deleted the branch, let me repush it | 14:34 |
| seb128 | I might open a feature request again gbp to see what they think | 14:34 |
| Laney | it has a "postimport" hook thing, you could add a dch call in there | 14:35 |
| Trevinho | Laney: and also https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/gnome-terminal/+git/gnome-terminal/+merge/348854 | 14:35 |
| Trevinho | ah no that should be there | 14:35 |
| Trevinho | the UI is wrong though | 14:35 |
| seb128 | Laney, thx, I add that to my list of things to read about (might still open a bug to know if they think that could be a good default) | 14:36 |
| Laney | ok | 14:36 |
| Laney | did bzr do something fancy there? | 14:36 |
| Laney | Trevinho: can you please tell me them all at once? | 14:36 |
| Laney | it's a bit hard to work when I keep needing to switch back to this git stuff | 14:36 |
| Trevinho | Laney: ok | 14:36 |
| Trevinho | I'll list you them all | 14:37 |
| Laney | thx | 14:37 |
| Trevinho | soon ™️ | 14:37 |
| seb128 | I don't know, bzr was more rudimentary :p | 14:37 |
| seb128 | my way to do an update in bzr was "dch -v <new_version>; bzr commit; dch -r/debcommit -r" | 14:37 |
| Laney | alright | 14:38 |
| seb128 | I never used an import command | 14:38 |
| Laney | huh, weird, I never didn't use bzr import-upstream | 14:38 |
| Laney | or merge-upstream or whatever it is | 14:38 |
| seb128 | I didn't feel the need, especially with our debian/ only vcs-es | 14:39 |
| seb128 | nothing to import really | 14:39 |
| Laney | uses the watch file so saves some typing / thinking | 14:39 |
| seb128 | right | 14:39 |
| Laney | like import-orig --uscan | 14:39 |
| * didrocks looks again at a guide to convert bzr to git for ubuntu-settings | 14:49 | |
| didrocks | NOOOOOOOOOOOOOOOOOO bzr: ERROR: exceptions.TypeError: cannot concatenate 'str' and 'int' objects | 14:52 |
| didrocks | in fastimport bzr plugin :/ | 14:52 |
| Laney | //////////o\\\\\\\\\\\\\\\\\\\\\\\\\\\ | 14:53 |
| happyaron | :D | 14:55 |
| didrocks | and a fix + SRU + new shiny git ubuntu-settings branch with master and bionic! | 15:05 |
| * didrocks deletes the bzr repo for this one | 15:06 | |
| Trevinho | didrocks: use https://git.launchpad.net/~canonical-desktop-team/+git/ubuntu-desktop-gbp-importer/tree/importer.sh (might need few tunings for non-gnome :)) | 15:06 |
| didrocks | Trevinho: I took 14 minutes includes the SRU for new upload + maintenance branch | 15:07 |
| didrocks | Trevinho: I'm sure using the importer would have taken more time ;) | 15:07 |
| didrocks | (the 14 minutes includes the fix) | 15:07 |
| Trevinho | naaaaaa... it does all without having you to do anything :-D | 15:07 |
| Trevinho | well on gnome at least | 15:08 |
| didrocks | yeah, and withotu issues, we just have some examples of it ^ :p | 15:08 |
| Trevinho | yep flawlessy :D | 15:08 |
| Trevinho | well, more to spot, but at least we got them all | 15:08 |
| didrocks | well, it seems we didn't do any fix on the one seb128 mentioned? | 15:09 |
| Trevinho | didrocks: the only thing bzr-fast import really works bad is when you've weird tags | 15:09 |
| Trevinho | didrocks: I'm doing it now | 15:09 |
| didrocks | did you get why robert commit got reverted? | 15:09 |
| didrocks | ah ok, and fixing the import script? | 15:09 |
| Trevinho | didrocks: I can try to launch that again, let me see what happens | 15:09 |
| Trevinho | didrocks: so if a repo has some uncommon tags (other than %, but like when using ~), this will fix it | 15:11 |
| Trevinho | https://git.launchpad.net/~canonical-desktop-team/+git/ubuntu-desktop-gbp-importer/tree/importer.sh#n160 | 15:11 |
| Trevinho | as unfortunately bzr:: remote doesn't work well with these | 15:11 |
| Trevinho | didrocks: probably I forgot to push the old version of gnome-control-center before merging with ubuntu-desktop | 15:26 |
| Trevinho | because I've just launched the script fresh | 15:26 |
| Trevinho | and commit is there https://usercontent.irccloud-cdn.com/file/MRtDlUUo/image.png | 15:26 |
| Trevinho | as the script was doing | 15:27 |
| Trevinho | after_release_commits="$(git log "$bzr_last_release"..ubuntu-bzr/master --reverse --format=format:%H)" | 15:27 |
| Trevinho | and reapplying them, if not, would have warned | 15:27 |
| Trevinho | so, not sure what went wrong there... | 15:28 |
| Trevinho | didrocks: you forgot to push tags in https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/ubuntu-settings/?h=bionic ? | 15:32 |
| Trevinho | and master too, well tags in general :) | 15:33 |
| didrocks | Trevinho: well, I thought about them and "I shouldn't forget pushing them" | 15:33 |
| didrocks | then, a git push later | 15:33 |
| didrocks | (fixed) | 15:33 |
| didrocks | :) | 15:33 |
| seb128 | didrocks, one pro tip, "git config push.followTags true" | 15:34 |
| * seb128 hides | 15:34 | |
| didrocks | thanks for spotting! | 15:34 |
| didrocks | seb128: there is no procedure for a native package! | 15:34 |
| didrocks | who wrote this wiki page? :p | 15:34 |
| seb128 | lol | 15:34 |
| Laney | SICKENING | 15:34 |
| didrocks | pushed tags | 15:35 |
| didrocks | FINALLY | 15:35 |
| didrocks | :) | 15:35 |
| Trevinho | didrocks: you didn't apply your followtags thing :) | 15:37 |
| Trevinho | I normally use `git tag | grep -E '^ubuntu/|^debian/|^upstream/' | xargs --no-run-if-empty git push <remote>` for gnome stuff, but could be smarter and added to gbp parsing the gbp conf | 15:38 |
| didrocks | Trevinho: I don't think we need to have an ubuntu/ tag for native packages | 15:40 |
| Trevinho | didrocks: yeah, I agree | 15:40 |
| didrocks | Trevinho: note that gbp conf is different as well, we don't have dedicated ubuntu/boo branches | 15:41 |
| didrocks | I think native packages which are ubuntu only don't need that complexity IMHO | 15:41 |
| didrocks | master and other branches | 15:41 |
| Trevinho | I would have just used git push --tags then Laney doesn't want to have unused refs around, so... | 15:41 |
| didrocks | (so yeah, that was on purpose) | 15:41 |
| Trevinho | indeed | 15:41 |
| popey | Grr. I did my updates today, and suddenly ALT+Left/Right now switch VT and ALT+F(n) switch VT too. | 15:49 |
| popey | Have seen this before. Seems to happen whenever I update the shell without restarting | 15:49 |
| tsimonq2 | I remember seeing a bug for this too | 15:49 |
| popey | https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1508146 | 15:50 |
| ubot5 | Ubuntu bug 1710637 in systemd (Ubuntu Xenial) "duplicate for #1508146 Input falls through to gdm3 and terminates the session on Ctrl+C after udevadm trigger is executed under wayland" [Undecided,New] | 15:50 |
| popey | seems long standing | 15:50 |
| Laney | what was updated? | 15:53 |
| popey | http://paste.ubuntu.com/p/8ptFWbgMBb/ | 15:55 |
| popey | that lot | 15:55 |
| Trevinho | seb128: if you've my remote on g-c-c just `git fetch marco`, git checkout ubuntu/master; git cherry-pick 620fee3b4b should get robert change back | 15:56 |
| Trevinho | should I add that to bionic too? | 15:56 |
| Laney | git pull https://git.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center ubuntu/master <- easier than that lot | 15:58 |
| Trevinho | right :-D | 15:58 |
| Trevinho | lp:~3v1n0/ .. | 15:58 |
| Laney | if you have the thing set up | 15:58 |
| Laney | if not, it's "go edit some config file" | 15:58 |
| Trevinho | but need to tell seb the harder way so he hates more git :-D | 15:59 |
| Laney | correct | 15:59 |
| Trevinho | but at least he learn the hard way | 15:59 |
| didrocks | if he followed the *excellent* wiki page, he has the proper config for lp: ;) | 16:00 |
| Laney | sure, but I just would avoid giving commands that might error if you missed some step on the wiki page | 16:03 |
| Laney | when it's not essential | 16:03 |
| === pstolowski is now known as pstolowski|afk | ||
| seb128 | Trevinho, sorry but I need to step out of the keyboard for a while, if nobody beats me to it I've a look later or tomorrow | 16:23 |
| oSoMoN | time for some real-life hacking, have a good evening everyone | 16:36 |
| Trevinho | Laney: so as for the list of git changes, other that git pull for g-c-c to reintroduce robert stuff, this the last one to merge | 16:40 |
| Trevinho | https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/gdm3/+git/gdm3/+merge/349818 | 16:40 |
| Trevinho | as for robert change, that should be pushed to bionic branchc too, no? | 16:42 |
| Trevinho | i guess it's SRU suitable | 16:42 |
| Trevinho | one more for nautilus upstream 3.26 release, we'll have to wait, as flatpak build isn't working for some reason whith those cherry-picks, so I need to fix the stack or wait them to do it | 16:43 |
| Trevinho | so for now better to go with what we have | 16:43 |
| Trevinho | seb128: if reverting these commits is something we want I'm curious weather is needd to use 3.26.3.1 now... However the good point of it is that once we'll have 3.4 we don't have to re-revert them again, so sooner is better than later not to forget | 16:44 |
| Laney | pushed gnome-control-center and gdm3 | 16:49 |
| Laney | no opinion on bionic, the uploader could as well do that | 16:49 |
| Laney | or make it a proper merge proposal so it looks like a sponsorship request | 16:49 |
| Laney | bbl | 16:51 |
| Trevinho | k thanks lovely Iain | 16:59 |
| Trevinho | seb128: i've pushed the reverts of reverts in nautilus too.... | 17:00 |
| Trevinho | wanted to revert them 10 times, just for fun of revert of rever of revert :-D | 17:00 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
