Merge lp:~mvo/snapcraft/more-python-apt into lp:~ted/snapcraft/arbitrary-repos

[Michael Vogt]

Fix "can not find python-argparse" error by using the python-apt resolver to find the dependencies of the packages.

[Sergio Schvezov (sergiusens)]

it seems that manifest.txt is not required anymore, mind cleaning it from setup.py and also getting rid of self.manifest_dep_names or not removing it and doing a elif pkg.candidate.name in self.manifest_dep_names unless whatever is in manifest.txt is already covered by your condition.

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

Thanks for the simplification btw

[Sergio Schvezov (sergiusens)]

One more comment, not sure if it is good, but it was originally like that.

Also, can you use single quotes for strings?

[lp:~mvo/snapcraft/more-python-apt]

160. By Michael Vogt on 2015-09-11

address sergios review points

[Michael Vogt (mvo)]

One open question here is what to do with manifest.txt

review: Needs Fixing

Unmerged revisions

160. By Michael Vogt on 2015-09-11

address sergios review points

=== added directory 'examples/ros'
=== added directory 'examples/ros/snap'
=== added file 'examples/ros/snapcraft.yaml'
--- examples/ros/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/ros/snapcraft.yaml	2015-09-11 14:45:18 +0000
@@ -0,0 +1,11 @@
+name: ros
+version: 1.0
+vendor: Snappy developers <[e-mail]>
+summary: A ros example
+icon: icon.png
+description: A really small ros examples
+
+parts:
+  ros:
+    type: roscore
+

=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-09-10 22:01:22 +0000
+++ snapcraft/repo.py	2015-09-11 14:45:18 +0000
@@ -51,23 +51,29 @@
             srcfile = os.path.join(download_dir, 'etc', 'apt', 'sources.list')
             with open(srcfile, 'w') as f:
                 f.write(sources)
+            progress=apt.progress.text.AcquireProgress()
             self.apt_cache = apt.Cache(rootdir=download_dir, memonly=True)
-            self.apt_cache.update(sources_list=srcfile)
+            self.apt_cache.update(fetch_progress=progress, sources_list=srcfile)
             self.apt_cache.open()
         self.manifest_dep_names = self._manifest_dep_names()
         self.recommends = recommends
         self.download_dir = download_dir
 
     def get(self, package_names):
-        # TODO cleanup download_dir for clean gets and unpacks
-        self.all_dep_names = set()
-
-        all_package_names = self._compute_deps(package_names)
-
-        for pkg in all_package_names:
-            self.apt_cache[pkg].candidate.fetch_binary(destdir=self.download_dir)
-
-        return all_package_names
+        for name in package_names:
+            self.apt_cache[name].mark_install()
+            
+        for pkg in self.apt_cache:
+            # those should be already on each system, it also prevents
+            # diving into downloading libc6
+            if (pkg.candidate.priority in ('essential', 'important') and
+                pkg.name not in package_names):
+                print('Skipping priority essential/imporant %s' % pkg.name)
+                continue
+            if pkg.marked_install:
+                pkg.candidate.fetch_binary(destdir=self.download_dir)
+
+        return 
 
     def unpack(self, root_dir):
         pkgs_abs_path = glob.glob(os.path.join(self.download_dir, '*.deb'))
@@ -91,37 +97,6 @@
 
         return manifest_dep_names
 
-    def _compute_deps(self, package_names):
-        self._add_deps(package_names)
-
-        for pkg in package_names:
-            if pkg not in self.all_dep_names:
-                raise PackageNotFoundError(pkg)
-
-        return sorted(self.all_dep_names)
-
-    def _add_deps(self, package_names):
-        def add_deps(packages):
-            for pkg in packages:
-                # Remove the :any in packages
-                # TODO support multiarch
-                pkg = pkg.rsplit(':', 1)[0]
-                if pkg in self.all_dep_names:
-                    continue
-                if pkg in self.manifest_dep_names and pkg not in package_names:
-                    continue
-                deps = set()
-                try:
-                    candidate_pkg = self.apt_cache[pkg].candidate
-                except KeyError:
-                    raise PackageNotFoundError(pkg)
-                deps = candidate_pkg.dependencies
-                if self.recommends:
-                    deps += candidate_pkg.recommends
-                self.all_dep_names.add(pkg)
-                add_deps([x[0].name for x in deps])
-        add_deps(package_names)
-
 
 def _fix_symlinks(debdir):
     '''