Re: precise-updates and UDD
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 20-09-2012 09:47, Andreas Hasenack wrote: > This works, but fetches the released package (12.04.3), not the > one from updates (12.05): Forgot to add the link showing that precise-updates has 12.05: http://packages.ubuntu.com/precise-updates/landscape-client - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlBbELEACgkQeEJZs/PdwpDmCgCg4Xqdekd1A2P1F9oKWXqe1DUy YE0AoO4YpXwoN/Ugp4Vp2/GRxLlC/S5l =bdig -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
precise-updates and UDD
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, am I using the wrong url or is there a problem with precise-updates and UDD: $ bzr branch lp:ubuntu/precise-updates/landscape-client precise/landscape-client bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/precise-updates/landscape-client/". This also fails: $ bzr branch ubuntu:precise-updates/landscape-client precise/landscape-client bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/precise-updates/landscape-client/". This works, but fetches the released package (12.04.3), not the one from updates (12.05): $ bzr branch ubuntu:precise/landscape-client precise/landscape-client Most recent Ubuntu Precise version: 12.04.3-0ubuntu1 Packaging branch status: CURRENT Most recent Ubuntu Quantal version: 12.05-0ubuntu1 Packaging branch status: CURRENT Branched 45 revisions. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlBbEFwACgkQeEJZs/PdwpDxlwCgoo/Ni5I8NIjRFsfBCzH+Ww6J duUAnA0adWfhSn7rdQXiu/rOwZRD+XoB =ZdTJ -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 03:58 PM, Dmitrijs Ledkovs wrote: > This will help: > > $ cat ~/.bazaar/builddeb.conf [BUILDDEB] > commit-message-from-changelog=False > > Which bzr-builddeb are you using? Recent versions default to > False. ii bzr-builddeb 2.8.4 And I didn't have builddeb.conf. Thanks for the tip, that's now set. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/g0g4ACgkQeEJZs/PdwpAbvgCgoq5H+nX9dBmWQa/wIKlnhk/J lxYAn2CUVBbll9GyUMImWQPiJmXkfVOE =d1Ft -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 11:57 AM, Andreas Hasenack wrote: >> pull-lp-source landscape-client bzr init landscape-client cd >> landscape-client bzr import-dsc >> ../landscape-client_12.04.3-0ubuntu0.11.10.dsc > >> That will at least give you a branch you can work with. Though >> obviously, it won't have full history nor can you use a merge >> request with it. You'll still have to proved a debdiff in the >> end. > > Thanks, I didn't know about import-dsc either and did all that Ok, I dislike import-dsc. It commits and uses the debian/changelog for the commit message. Which in my case means spamming the IRC channel with debian/changelog. A huge one. In fact, I'm starting to dislike all these bzr "automations/plugins" that do unexpected things behind your back. It even mangles po files nowadays. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/gs9EACgkQeEJZs/PdwpDgTgCgxrXAuK9YBbf4mUZnleSnZctj 2DgAn2NGIDM3q/+70uVOR/0Ri0q0QO/9 =LF08 -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 11:45 AM, Andrew Starr-Bochicchio wrote: > On Tue, Jun 19, 2012 at 10:16 AM, Andreas Hasenack > wrote: >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 >> >> On 06/19/2012 10:57 AM, Andreas Hasenack wrote: >>> On 06/19/2012 10:47 AM, Dmitrijs Ledkovs wrote: >>>> https://bugs.launchpad.net/udd/+bug/653312 >>> >>>> Well it's a bug in the importer, so there is not much that >>>> you can do. Your best case is to use regular non-udd style >>>> of packaging. >> >> It's harder than I thought :( I really got used to udd and using >> branches. > > If you're used to working with the UDD tools, you could always do > something like create a temporary branch to work in: > > pull-lp-source landscape-client bzr init landscape-client cd > landscape-client bzr import-dsc > ../landscape-client_12.04.3-0ubuntu0.11.10.dsc > > That will at least give you a branch you can work with. Though > obviously, it won't have full history nor can you use a merge > request with it. You'll still have to proved a debdiff in the end. Thanks, I didn't know about import-dsc either and did all that manually (opened tarball, added files, pulled debian/* from previous package, etc) ;) - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/gk3QACgkQeEJZs/PdwpCFgwCgqAlemzaGMB9y3db53X8X4vsv iGAAoNRlX5E9adclVAf5sHaDSx6Eq37g =zozs -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 10:57 AM, Andreas Hasenack wrote: > On 06/19/2012 10:47 AM, Dmitrijs Ledkovs wrote: >> https://bugs.launchpad.net/udd/+bug/653312 > >> Well it's a bug in the importer, so there is not much that you >> can do. Your best case is to use regular non-udd style of >> packaging. It's harder than I thought :( I really got used to udd and using branches. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/gia8ACgkQeEJZs/PdwpBBLwCfasVbrfKFhCGEtXso4oXMPm7Z cGoAoOixr02wqbBHgzjFYDt7TxGnaEPN =oSk5 -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 10:47 AM, Dmitrijs Ledkovs wrote: > https://bugs.launchpad.net/udd/+bug/653312 > > Well it's a bug in the importer, so there is not much that you can > do. Your best case is to use regular non-udd style of packaging. > E.g.: > > $ pull-lp-source landscape-client oneiric-updates Thanks! I had no idea about pull-lp-source and was already starting to do some wgets. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/ghUAACgkQeEJZs/PdwpBPuACghGmKXsTXChapfZno/av/yDo6 OjEAoLhRUvuf/Mpnop9kpCJHuWrylky7 =7f7K -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/19/2012 10:41 AM, Andreas Hasenack wrote: > On 06/18/2012 06:58 PM, Dmitrijs Ledkovs wrote: > >> http://package-import.ubuntu.com/status/landscape-client.html#2012-04-22 > >> > > 00:43:56.697761 > >> Should explain. > > What does that mean? Is it a temporary error? Is the branch > corrupted? What do I need to do? > Never mind, bzr crashed locally for me now when running merge-upstream ../tarball, with that error. I'll drop udd for this sru and learn how to produce debdiffs. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/gg24ACgkQeEJZs/PdwpDAhACg9AyODsTL3yNqi5rn4spymNMU K74AoKXQDMtLnLrDj0RqVYi++cCkmjek =ZpLo -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/18/2012 06:58 PM, Dmitrijs Ledkovs wrote: > http://package-import.ubuntu.com/status/landscape-client.html#2012-04-22 > > 00:43:56.697761 > > Should explain. What does that mean? Is it a temporary error? Is the branch corrupted? What do I need to do? - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/ggW8ACgkQeEJZs/PdwpDbcwCg2l9QkjZOxvdgIKLyLuCaV537 1ycAn0TJxWOO7QIWKDljlvDbp9wtrNQZ =Nd/V -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
landscape-client in oneiric-updates
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, landscape-client got an update for oneiric a while ago, but the lp:ubuntu/oneiric-updates/landscape-client branch doesn't exist. Is it a case of the importer failing? How can we trigger it to run again for that package? The updated package: http://packages.ubuntu.com/oneiric-updates/landscape-client But the branch: $ bzr branch lp:ubuntu/oneiric-updates/landscape-client bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/oneiric-updates/landscape-client/". lp:ubuntu/oneiric/landscape-client exists, but it has the released version as expected, not the update. Thanks! - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/foZYACgkQeEJZs/PdwpC4dgCg4dW599swGtANKW3gPaHVFpVu IncAoJQNgUGQ544VMP2XCZRXPDi9gKf4 =hGlU -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: What to do when a packaging branch is out of date
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 04/04/2012 04:24 PM, James Westby wrote: > Hi, > > It is now up to date again. Thanks! - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk98oQAACgkQeEJZs/PdwpDrEACfeL/fkp3+8u+GX/LXEO4ildow EIMAn2qaTQ7asVZI2/Cw9JMFtuXMJghZ =qvhq -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: What to do when a packaging branch is out of date
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 03/20/2012 11:31 AM, James Westby wrote:
> On Tue, 20 Mar 2012 10:00 -0400, Scott Kitterman
> wrote:
>> On Tuesday, March 20, 2012 10:56:27 AM Andreas Hasenack wrote:
>>> So apparently a package update can be prepared using udd,
>>> released into the archive, and the packaging branch still be
>>> out of date:
>>>
>>> """ $ bzr branch ubuntu:landscape-client
>>> landscape-client-12.04-0ubuntu1 Most recent Ubuntu version:
>>> 12.04-0ubuntu1
>>>
>>>
>>> Packaging branch version: 11.07.1.1-0ubuntu2 Packaging branch
>>> status: OUT-OF-DATE Branched 40 revisions. $ """
>>>
>>> It's like it was released before being committed.
>>>
>>> What should I do if I want to prepare another fix? Wait? Ping
>>> someone to commit and then branch again? Do it with debdiffs
>>> and not worry about branches anymore?
>>>
>>> I emailed ubuntu-devel-discuss and someone told me that
>>> somebody has to manually commit to the udd branch, and that
>>> this is normal.
>>
>> It's normal for there to be some delay. It will (normally) be
>> automatically updated from what was uploaded. The only way there
>> isn't some delay is if someone manually commits the branch.
>>
>> I'm not sure how much delay is considered normal these days.
>
> The logs show that this package was updated at
>
> Time (UTC): 2012-03-20 13:07
>
> Approximately 14 hours after the upload.
>
> The reason for this is that the importer was throttled a week or so
> ago in order to help tracking down a service that was overloading
> Launchpad. That service was found and corrected but the importer
> was never turned back up to a reasonable speed. I've just done
> that now. Apologies for the delay.
Hi, can you take another look? It seems there is a delay again:
$ bzr branch ubuntu:landscape-client precise-already-done
Most recent Ubuntu version: 12.04.3-0ubuntu1
Packaging branch version: 12.04.2-0ubuntu1
Packaging branch status: OUT-OF-DATE
Branched 44 revisions.
There is an error for it in the package importer:
http://package-import.ubuntu.com/status/landscape-client.html#2012-03-30
06:12:01.518169
bzrlib.errors.UnknownErrorFromSmartServer: Server sent an unexpected
error: ('error', 'xmlrpclib.Fault', "")
- --
Andreas Hasenack
andr...@canonical.com
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk98mCkACgkQeEJZs/PdwpB2sQCgmaIgDJV9RZ/1Lxv5fS1pT6lo
s/UAn1AtqBgVEsbv2FT3kZtxewXKwIRy
=sWd4
-END PGP SIGNATURE-
--
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: bzr merge-upstream: why delete and add the same unchanged file?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/29/2012 11:07 AM, Jelmer Vernooij wrote: >> I think Andreas was asking about a way to just export the tarball >> and use it in merge-upstream without also merging the branch. > Aha. I guess you could always use something like this: > > bzr export -d foo-0.1.tar.gz bzr merge-upsteam > foo-0.1.tar.gz fwiw, now I just go to , bzr export /tmp/some-tarball.tar.gz and then do bzr merge-upstream /tmp/some-tarball.tar.gz in the ubuntu branch. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk90s7YACgkQeEJZs/PdwpAJOACfWb29ksWcyS1QI1yI03YJkvyz 5S4AoN4grNKQb10lZcKkt6Hzf+5Nvl4x =XzPo -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: bzr merge-upstream: why delete and add the same unchanged file?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/20/2012 05:58 PM, James Westby wrote: > On Tue, 20 Mar 2012 16:20:29 -0300, Andreas Hasenack > wrote: >> Why is it removing and adding the same file? This file (and >> several others) didn't change between ubuntu:landscape-client >> and lp:landscape-client, it's exactly the same. > > I'm assuming that this is the first time you've done any sort of > merge between the two? Yes, and I don't have commit or upload rights to ubuntu:landscape-client, so it will always be the first time :) > Because they are unrelated branches from bzr's point of view, it > has to reconcile the history and file-ids. For the history it joins > the two I understand they are isolated and separated branches. I thought supporting a bzr branch for the upstream branch was more of a convenience and that merge-upstream would actually just export it to a temporary tarball and then move on like if I had given it a tarball to work with, but I see now that's not the case. If I do the export to a tarball and give the tarball to merge-upstream, it works as I would have expected: http://pastebin.ubuntu.com/892732/ But of course, no history then, just my changelog. > revisions history together, which is fine. The file ids isn't so > easy though, as they can't be joined. > > Therefore it replaces the ubuntu file ids with the upstream ones, > which is why you see everything as removed and added. > > This is annoying, but it allows you to move forward, and only needs > to happen once. It also makes it very hard to review the changes this first time, right? The diff isn't helpful. Thanks for the explanation! I think I will stick with the temporary export tarball approach for now. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9o8WwACgkQeEJZs/PdwpC9aQCbBJTQkHH3sQRkDcOMqAJQncX3 g+gAoKrlAYRU+kwy4SNPtFsm6vLs0KgW =+GYx -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
bzr merge-upstream: why delete and add the same unchanged file?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I'm experimenting with bzr merge-upstream and found what I think is an odd behavior. I'm probably just using it incorrectly, but I can't find out what I'm doing wrong. I'm merging lp:landscape-client into ubuntu:landscape-client. Let's say I'm preparing a new release. This is the command-line: $ bzr merge-upstream ~/canonical/source/landscape-client/trunk/ - --revision 531 --version 12.04.1 (~/canonical/source/landscape-client/trunk has lp:landscape-client) https://pastebin.canonical.com/62652/ is the output There are some conflicts, but I'm not worried about those for now (unless they explain what I'm seeing). This is my question: $ bzr st LICENSE removed: LICENSE added: LICENSE This happened to *all* files. There is not a single "modified" file in the bzr status output. Why is it removing and adding the same file? This file (and several others) didn't change between ubuntu:landscape-client and lp:landscape-client, it's exactly the same. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9o2HwACgkQeEJZs/PdwpAqZwCgz+1yIZ1RR/sk/8oIlm9Er3Bz olUAnAplPNp85e9gDO+FrgbF/1Nd1Xsk =UnwB -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
What to do when a packaging branch is out of date
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 So apparently a package update can be prepared using udd, released into the archive, and the packaging branch still be out of date: """ $ bzr branch ubuntu:landscape-client landscape-client-12.04-0ubuntu1 Most recent Ubuntu version: 12.04-0ubuntu1 Packaging branch version: 11.07.1.1-0ubuntu2 Packaging branch status: OUT-OF-DATE Branched 40 revisions. $ """ It's like it was released before being committed. What should I do if I want to prepare another fix? Wait? Ping someone to commit and then branch again? Do it with debdiffs and not worry about branches anymore? I emailed ubuntu-devel-discuss and someone told me that somebody has to manually commit to the udd branch, and that this is normal. - -- Andreas Hasenack andr...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9ojIsACgkQeEJZs/PdwpDzAgCgpvRePROgSwZjqwS5uWiuYCzN WScAoPLT/aVcibCEUHEVwHE8p8o1WSGg =VzJk -END PGP SIGNATURE- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
