On 05/04/13 18:33, Maxime Gauduin wrote: > From: Alucryd <[email protected]> > > Currently, you can pull bzr repos using different URLs like "lp:" > "http://"; or "https://"; in the source array. This works well the first > time, but when you want to build the package again and update the local > repo, makepkg will run 'bzr config parent_location' to check if the > local repo is the same as the distant one. Except the reported URL is > generally not the one used in the source array (which is valid > nonetheless) and will fail with a non helpful error message. This patch > makes makepkg print the correct reported URL so that it can be manually > changed in the source array. I, and Gary van der Merwe who wrote the bzr > support, realize this may not be the best approach as it prevents people > from using the convenient "lp:" URLs, but for the time being people will > stop wondering why their valid URLs are rejected. >
So there is seriosuly no way to get to the original URL used by bzr? That just seems... crap! This seems fine then. > Signed-off-by: Maxime Gauduin <[email protected]> > --- > scripts/makepkg.sh.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index da620a4..83900c5 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -473,6 +473,7 @@ download_bzr() { > # Make sure we are fetching the right repo > if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; > then > error "$(gettext "%s is not a branch of %s")" "$dir" > "$url" > + error "$(gettext "The reported URL is %s")" "$(bzr > config parent_location -d $dir)" > plain "$(gettext "Aborting...")" > exit 1 > fi >
