=== NCommand` is now known as NCommander
=== NCommander is now known as Guest84161
bdmurrayslangasek: I've uploaded xorg and update-manager changes for fglrx and hwe support00:34
slangasekbdmurray: \o/ thanks00:42
acheronukdo daily isos stop building after so many failures? e.g. https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/yakkety/kubuntu07:33
jbichaacheronuk: I tried asking in #kubuntu-devel this weekend for someone to try to rebuild the yakkety iso since it might work now (the kactivities binary has been removed)07:37
tsimonq2jbicha: that's what we're trying to get done now ;)07:37
cjwatsonThere's nothing automatic that stops image builds after failures.07:37
tsimonq2oh, weird07:38
cjwatsonBut the Kubuntu image build is commented out of the crontab for some reason.07:38
tsimonq2could someone rebuild Kubuntu Yakkety then?07:38
cjwatsonI've uncommented it and started a build.07:39
tsimonq2ahh, so a member of the release team might have done that07:39
tsimonq2thanks so much cjwatson! :)07:39
tsimonq2acheronuk: ^07:39
cjwatsonCould have been an accident when dealing with disabled builds around the beta.07:39
acheronukjbicha: yes I saw that. yofl is snowed under with other commitments I think, so proably didn't see it07:39
acheronukmay still fail, but would be nice to give it a poke and see now kactivities is gone07:41
cjwatsonShould be on automatic as usual now, anyway.07:42
acheronukthank you :)07:42
=== ochosi_ is now known as ochosi
jbichacjwatson: since we already missed today's run, do you want to run a kubuntu iso rebuild now?07:44
cjwatsonjbicha: 08:39 <cjwatson> I've uncommented it and started a build.07:45
* acheronuk crosses everything it works07:48
acheronukBTW, are these the build scripts? http://bazaar.launchpad.net/~ubuntu-cdimage/debian-cd/ubuntu/files07:53
cjwatsonThat's part of them, but debian-cd is mostly not very interesting for live-CD-type builds.07:56
cjwatsonThe top level is lp:ubuntu-cdimage, but most of the actual live filesystem content is constructed by the livecd-rootfs and live-build packages.07:57
cjwatson(lp:ubuntu-cdimage is mainly coordination and publishing)07:57
acheronukah. ok. thanks07:59
acheronukthat seemed to build :D08:08
=== happyaro1 is now known as happyaron
=== ant_ is now known as Guest58751
=== Guest84161 is now known as NCommander
=== NCommander is now known as Guest43443
barryrelease team, can i get a rubber stamp for LP: #1617007 ?14:50
ubot5Launchpad bug 1617007 in twine (Ubuntu) "[FFE] twine 1.8.1-1" [Undecided,New] https://launchpad.net/bugs/161700714:50
apw^ /me is on that ...15:26
bdmurrayslangasek: Could you review the update-manager / xorg-server-lts-xenial uploads in the Trusty queue?15:46
robruxnox: if you're still about can you take a look at my reply to your review of my branch? thanks15:49
slangasekbdmurray: looking15:56
xnoxweird, i didn't get an email.16:03
robruxnox: oh I replied to the email I got16:09
robruxnox: my reply went through lp16:10
xnoxrobru, lp is slow =) finally got your email. responded on launchpad instead.16:31
xnoxrobru, the order of how things are cloned and merged matters a lot....16:32
xnoxideally one should fetch/reset to project's master branch first16:32
xnoxand then from there call: merge lp:proposed-repo proposed-fix-branch16:32
xnoxinstead of reverse. See my further comments.16:32
slangasekbdmurray: accepted, thanks17:16
=== Guest43443 is now known as NCommander
robruxnox: slangasek: what's the git equivalent of bzr-builddeb, specifically the part that allows it to merge debian/changelog without conflicts?18:36
slangasekrobru: 'dpkg-mergechangelogs'18:38
xnoxrobru, i have a thing for you sir!18:38
xnoxrobru, "just" specify18:38
xnox[merge "dpkg-mergechangelogs"]18:38
xnox        name = debian/changelog merge driver18:38
xnox        driver = dpkg-mergechangelogs -m %O %A %B %A18:38
slangasek(which is the underlying implementation in bzr-builddeb's implementation also)18:38
xnoxin ~/.gitconfig18:38
xnoxand then there is more18:39
robruxnox: slangasek: great, thanks18:39
xnox$ cat ~/.config/git/attributes18:39
xnoxdebian/changelog merge=dpkg-mergechangelogs18:39
xnoxtogether first thing creates a merge strategy18:39
xnoxthe second thing sets a "global" (XDG_BASE_DIR location) attribute to change git behaviour for files that match that pattern in any repository18:39
robruxnox: what do you mean "any repository"? what repositories will not be handled by the global gitconfig?18:41
xnoxrobru, ~/.gitconfig creates a merge strategy, and no files use it.18:42
xnoxrobru, ~/.config/git/attributes sets the attribute for any repositories that this user will operate on. "Usually" attributes in git are set on per repository basis in .git/info/attributes and thus don't propagate across clones at all.18:43
xnox"usually" attributes are used on windows systems to specify line-endings conversions and some such stuff.18:43
robruxnox: ah18:43
xnoxdpkg-mergechangelogs is "weird"18:43
robruxnox: will git know to look in ~/.config if no $XDG_* variables are set? this is not running as an interactive user18:45
robruxnox: better question, where does git look for global attributes when no $XDG_* vars are set ;-)18:45
robruxnox: nm, "If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead."18:47
xnoxrobru, yes... XDG spec says to try $HOME/.config if e.g. XDG_CONFIG_HOME is not set.18:49
xnoxthat's why XDG base dir spec is good.18:50
robruxnox: hm, not working, any ideas here: http://paste.ubuntu.com/23113050/ ?18:54
xnoxrobru, ok, and what users runs git? and is the home for that user in /var/www ?18:56
* xnox checks my configs more18:56
robruxnox: yes, www-data is running git, and /var/www is $HOME18:56
robruI'll try to reproduce locally, maybe it's a real conflict18:56
xnoxrobru, $ sudo apt install dpkg-dev ?18:58
robruxnox: already installed19:00
xnoxrobru, check permissions on those files too... should be owned by www-data.19:00
* xnox tries to find a way to validate which attributes are applied for a file19:00
xnox$ git check-attr --all debian/changelog19:01
xnoxdebian/changelog: merge: dpkg-mergechangelogs19:01
robruxnox: this may be a legitimate conflict, these changelogs were both done by hand so it's not clear to me that this is quite what mergechangelogs was meant for: http://paste.ubuntu.com/23113075/19:01
xnoxhorum. yeah.19:02
xnoxquick way to check that dpkg-mergechangelogs work is to "merge" a git-import-dsc "commit"19:02
xnoxor run the check-attr command.19:03
xnoxif that shows as enabled for debian/changelog, then all is good, and one should get less merge conflicts.19:03
robruxnox: oh I see, it's trying to merge two different entries with the same version number, that's why19:03
xnoxrobru, which means that dpkg-mergechangelogs is doing something, and trying to be helpful.19:03
robruxnox: ok thanks, yeah I think everything is good, just bad example to test with19:04
* xnox wonders if launchpad has dpkg-mergechangelogs setup19:04
xnoxfor git19:04
cjwatsonxnox: it does not, but it would at most only matter for merge previews20:23
cjwatsonxnox: and arguably setting it up for those would be misleading, because it would mean an apparently conflict-free merge would only be conflict-free if you happened to have dpkg-mergechangelogs set up20:23
xnoxtrue, yet it would be so nice.20:24
xnoxto be honest, i'm failing to see why debian/ubuntu does not ship that enabled globally by default.20:24
xnoxit would be easy enough to do.20:24

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!