Changeset 48831cd

Timestamp:

Apr 25, 2013 10:44:32 AM (8 weeks ago)

Author:

Kris Moore <kris@…>

Branches:

master, 9.1-release

Children:

afa0da8

Parents:

7541802

Message:

When using the "pc-pkg" wrapper, make sure to also do the conflict checking

File:

• src-sh/pc-metapkgmanager/pc-metapkgmanager (modified) (1 diff)

src-sh/pc-metapkgmanager/pc-metapkgmanager

@@ -307 +307 @@
    download_cache_packages "pkg $op $flags"
 
+   # Lets check for any conflicts doing this install
+   check_pkg_conflicts "${op} -F $flags"
+   if [ $? -ne 0 ] ; then
+        exit 1
+   fi
+
    # Time to run pkgng and let it do its thing
    pkg $fullopts