[PATCH 4/9] set $MIRRORSITE default by --distribution

Osamu Aoki osamu at debian.org
Sat Jan 23 12:24:51 UTC 2010


On Sat, Jan 23, 2010 at 12:05:55AM +0100, Loïc Minier wrote:
> On Sun, Jan 17, 2010, Loïc Minier wrote:
> > +    expeimental)
>  "experimental"

fixed.
 
> > +    *-backports)
> > +	DISTRIBUTION_ORIGINAL="$DISTRIBUTION"
> > +	DISTRIBUTION="${DISTRIBUTION%%-backports}"
> > +	;;
> > +    *-proposed-updates)
> > +	DISTRIBUTION_ORIGINAL="$DISTRIBUTION"
> > +	DISTRIBUTION="${DISTRIBUTION%%-proposed-updates}"
> > +	;;
> 
>  I don't really think that works well with just two vars.  Either we
>  support listing as many dists as one wants, or we just allow passing
>  templates (such as the APTCONFDIR approach).
> 
>  With Ubuntu, it's either karmic + karmic-security (for security builds)
>  or karmic + karmic-security + karmic-updates (for stable updates) or
>  karmic + karmic-security + karmic-updates + karmic-backports (for
>  backports).

Yes.  That is what I understood.  They all use karmic and their update
archive.
 
>  Also, relying on parts of the name isn't too nice IMO and it makes a
>  lot of duplication:

I realize DISTRIBUTION_ORIGINAL="$DISTRIBUTION"
this may be shared.

> > +    */updates)
> > +	DISTRIBUTION_ORIGINAL="$DISTRIBUTION"
> > +	DISTRIBUTION="${DISTRIBUTION%%/updates}"
> > +	;;
...
> 
>  That's fine
> 
> > @@ -69,6 +135,10 @@ while [ -n "$1" ]; do
> >  	    # preloaded
> >  	    shift; shift;
> >  	    ;;
> > +	--distribution|-d)
> > +	    # preloaded
> > +	    shift; shift;
> > +	    ;;
> 
>  Not too nice   :-/

Well this is one of the 2 ways to get PROFILE value decided first as I
said.
 
> > -# handle 'experimental' specially. -- required for raw pbuilder (create/update) only.
> > -if [ "$DISTRIBUTION" = "experimental" ]; then
> > -    DISTRIBUTION="sid"
> > -    EXPERIMENTAL="true"
> > -else 
> > -    EXPERIMENTAL=
> > -fi
> 
>  It's nice to think that we might get rid of this special case; thanks

Well this was buggy part... We need to use $DISTRIBUTION_ORIGINAL
instead.  I am sorry that I may have caused confusion.

>  "experimental"

fixed.
 
>  Lots of duplication here again:
> 
> > +	etch-backports|lenny-backports)

I cleaned a bit but since we have different archives, we need many
cases.

> > +DEBIAN_OLD_MIRRORSITE="http://archive.debian.org/debian"
> > +DEBIAN_VOLATILE_MIRRORSITE="http://volatile.debian.org/debian-volatile"
> > +DEBIAN_BACKPORTS_MIRRORSITE="http://backports.org/debian"
> > +DEBIAN_SECURITY_MIRRORSITE="http://security.debian.org"
> > +UBUNTU_MIRRORSITE="http://archive.ubuntu.com/ubuntu"
> 
>  Ubuntu uses ports.ubuntu.com/ubuntu-ports for port arches (armel, lpia,
>  ia64, ...); only amd64 and i386 on archive.u.c/u

Yes.  I am aware of it.

This is next step.  But this is something we can override in
/etc/pbuilderrc using install scripts as quick fix.
 
>  What would you think of splitting sources.list generation out in a
>  separate binary as to allow for easy testing in the testsuite?

I thought about it.

Does etch and LTS Ubuntu suport this?

Osamu

PS: Since I have updated local repo after reading your comment and did
too much rebase, I need to test result more.



More information about the Pbuilder-maint mailing list