[Merge] ~freyes/ubuntu-dev-tools:lp1314076 into ubuntu-dev-tools:master

[Mattia Rizzolo]

Review: Needs Fixing



Diff comments:

> diff --git a/pbuilder-dist b/pbuilder-dist
> index 6043286..dd84dd4 100755
> --- a/pbuilder-dist
> +++ b/pbuilder-dist
> @@ -276,6 +269,13 @@ class PbuilderDist(object):
>          arguments += ['--mirror', mirror]
>  
>          othermirrors = []
> +        localrepo = '/var/cache/archive/' + self.target_distro
> +        if os.path.exists(localrepo):
> +            arguments += [
> +                '--othermirror',
> +                'deb file:///var/cache/archive/ %s/' % self.target_distro,
> +            ]
> +

then there will still be other possible `--othermirror`s later on.
What should instead be done here is to add that deb line inside the 'othermirrors' array, so that a correct, single one, `--othermirror` can be generated in line 335.

>          if self.target_distro in self._debian_distros:
>              debian_info = DebianDistroInfo()
>              try:


-- 
https://code.launchpad.net/~freyes/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/345774
Your team Ubuntu Development Team is subscribed to branch ubuntu-dev-tools:master.