[Merge] lp:~sergiusens/phablet-tools/rtm into lp:phablet-tools

[Paul Larson]

See below

Diff comments:

> === modified file 'phablet-click-test-setup'
> --- phablet-click-test-setup	2014-05-14 20:12:36 +0000
> +++ phablet-click-test-setup	2014-08-28 21:28:42 +0000
> @@ -45,15 +45,15 @@
>      def series(self):
>          return self._series
>  
> -    def __init__(self, release, arch):
> +    def __init__(self, distribution, release, arch):
>          self.lp = Launchpad.login_anonymously('phablet-click-test-setup',
>                                                'production',
>                                                '~/.launchpadlib/cache',
>                                                version="devel")
> -        distro = self.lp.distributions['ubuntu']
> +        distro = self.lp.distributions[distribution]
>          self._series = distro.getSeries(name_or_version=release)
>          self._arch_series = self._series.getDistroArchSeries(archtag=arch)
> -        self._archive = self.lp.distributions['ubuntu'].main_archive
> +        self._archive = self.lp.distributions[distribution].main_archive
>  
>  
>  lp = None
> @@ -75,7 +75,7 @@
>  )
>  
>  python_packages = (
> -    'python-mock', 'python-dateutil', 'python3-dateutil'
> +    'python3-dateutil',
>  )
>  
>  
> @@ -110,6 +110,8 @@
>                          help='User on device to use')
>      parser.add_argument('--wipe', action='store_true',
>                          help='Clean up previous setup on device')
> +    parser.add_argument('--distribution', default='ubuntu',
> +                        help='Selects distribution to use')

can't we just grab this from the distributor id in lsb_release?

>      return parser.parse_args()
>  
>  
> @@ -237,7 +239,7 @@
>      adb.start()
>      arch = adb.shell('dpkg --print-architecture').strip()
>      series = adb.shell('lsb_release -c -s').strip()
> -    lp = LP(series, arch)
> +    lp = LP(args.distribution, series, arch)
>      test_dir = tempfile.mkdtemp()
>      os.mkdir(os.path.join(test_dir, py2_subdir))
>      atexit.register(cleanup, test_dir)
> 


-- 
https://code.launchpad.net/~sergiusens/phablet-tools/rtm/+merge/232647
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~sergiusens/phablet-tools/rtm into lp:phablet-tools.