Merge lp:~sergiusens/snapcraft/1507814 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Query the apt cache to verify if a package is installed or not

[Michael Vogt (mvo)]

Looks good, one (silly) suggestion inline.

review: Needs Fixing

[Michael Vogt (mvo)]

Uh, sorry I'm an idiot, this should have been an "approve" before already. Using apt-get is fine of course and you can just use "apt-get -o Dpkg::Progress-Fancy=1" to get the same nice progress bar.

review: Approve

[lp:~sergiusens/snapcraft/1507814]

251. By Sergio Schvezov on 2015-10-20

Use fancy progress for apt

=== modified file 'integration-tests/data/assemble/snapcraft.yaml'
--- integration-tests/data/assemble/snapcraft.yaml	2015-09-30 17:13:13 +0000
+++ integration-tests/data/assemble/snapcraft.yaml	2015-10-20 13:49:32 +0000
@@ -16,5 +16,5 @@
 
 parts:
     make-project:
-      plugin: make-project
+      plugin: make
       source: .

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-10-20 01:49:04 +0000
+++ integration-tests/units/jobs.pxu	2015-10-20 13:49:32 +0000
@@ -63,11 +63,21 @@
     test ! -e ./snap/dir
 flags: simple has-leftovers
 
+id: snapcraft/normal/assemble-inexistent-build-package
+command:
+    set -x
+    cp -rT $PLAINBOX_PROVIDER_DATA/assemble .
+    echo "build-packages:" >> snapcraft.yaml
+    echo "  - inexistent-package" >> snapcraft.yaml
+    OUTPUT=$(${SNAPCRAFT} assemble 2>&1)
+    echo $OUTPUT | grep "Could not find all the .*build-packages.* required in snapcraft\.yaml"
+flags: simple has-leftovers
+
 id: snapcraft/normal/assemble-no-plugin
 command:
     set -x
     cp -rT $PLAINBOX_PROVIDER_DATA/assemble .
-    sed -e '/.*plugin: make-project$/d' -i snapcraft.yaml
+    sed -e '/ *plugin: make$/d' -i snapcraft.yaml
     OUTPUT=$(${SNAPCRAFT} assemble 2>&1)
     test $? = 1 || exit 1
     echo $OUTPUT | grep -q 'Issues while validating snapcraft.yaml: the "plugin" keyword is missing for the "make-project" part.'

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-10-19 20:42:36 +0000
+++ snapcraft/cmds.py	2015-10-20 13:49:32 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import apt
 import filecmp
 import glob
 import logging
@@ -351,21 +352,18 @@
 
 def _install_build_packages(packages):
     new_packages = []
-    for check_pkg in packages:
-        if subprocess.call(['dpkg-query', '-s', check_pkg],
-                           stdout=subprocess.DEVNULL,
-                           stderr=subprocess.DEVNULL) != 0:
-            new_packages.append(check_pkg)
-    if new_packages:
-        logger.info('Installing required packages on the host system')
+    for pkg in packages:
         try:
-            _check_call(
-                ['sudo', 'apt-get', '-y', 'install'] + new_packages,
-                stdout=subprocess.DEVNULL)
-        except subprocess.CalledProcessError:
+            if not apt.Cache()[pkg].installed:
+                new_packages.append(pkg)
+        except KeyError:
             logger.error('Could not find all the "build-packages" required '
                          'in snapcraft.yaml')
             sys.exit(1)
+    if new_packages:
+        logger.info('Installing required packages on the host system')
+        _check_call(['sudo', 'apt-get', '-o', 'Dpkg::Progress-Fancy=1',
+                     '-y', 'install'] + new_packages)
 
 
 def _load_config():