Merge pull request #1 from conda/master

Merge master
msarahan · Aug 2, 2018 · d0545fc · d0545fc
2 parents 25ba51e + 89e3322
commit d0545fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/conda_build/build.py b/conda_build/build.py
@@ -71,14 +71,6 @@
 from conda_build.create_test import create_all_test_files
 
 import conda_build.noarch_python as noarch_python
-try:
-    from conda_verify.verify import Verify
-except ImportError:
-    Verify = None
-    print("=" * 60)
-    print("Warning: Importing conda-verify failed.  Please be sure to test your packages.  "
-          "conda install conda-verify to make this message go away.")
-    print("=" * 60)
 
 from conda import __version__ as conda_version
 from conda_build import __version__ as conda_build_version
@@ -984,6 +976,14 @@ def order(f):
 
         # we're done building, perform some checks
         tarcheck.check_all(tmp_path, metadata.config)
+
+        # we do the import here because we want to respect logger level context
+        try:
+            from conda_verify.verify import Verify
+        except ImportError:
+            Verify = None
+            log.warn("Importing conda-verify failed.  Please be sure to test your packages.  "
+                "conda install conda-verify to make this message go away.")
         if getattr(metadata.config, "verify", False) and Verify:
             verifier = Verify()
             checks_to_ignore = metadata.config.ignore_verify_codes if \
@@ -2449,7 +2449,7 @@ def clean_build(config, folders=None):
         utils.rm_rf(folder)
 
 
-def is_package_built(metadata, env):
+def is_package_built(metadata, env, include_local=True):
     for d in metadata.config.bldpkgs_dirs:
         if not os.path.isdir(d):
             os.makedirs(d)
@@ -2464,7 +2464,9 @@ def is_package_built(metadata, env):
                                       locking=metadata.config.locking,
                                       timeout=metadata.config.timeout,
                                       clear_cache=True)
-    urls = [url_path(metadata.config.output_folder), 'local'] + get_rc_urls()
+
+    urls = [url_path(metadata.config.output_folder), 'local'] if include_local else []
+    urls += get_rc_urls()
     if metadata.config.channel_urls:
         urls.extend(metadata.config.channel_urls)
 

diff --git a/conda_build/skeletons/rpm.py b/conda_build/skeletons/rpm.py
@@ -121,9 +121,9 @@
                          'macros': {}},
              'centos6': {'dirname': 'centos6',
                          'short_name': 'cos6',
-                         'base_url': 'http://mirror.centos.org/centos/6.9/os/{base_architecture}/CentOS/',  # noqa
-                         'sbase_url': 'http://vault.centos.org/6.9/os/Source/SPackages/',
-                         'repomd_url': 'http://mirror.centos.org/centos/6.9/os/{base_architecture}/repodata/repomd.xml',  # noqa
+                         'base_url': 'http://mirror.centos.org/centos/6.10/os/{base_architecture}/CentOS/',  # noqa
+                         'sbase_url': 'http://vault.centos.org/6.10/os/Source/SPackages/',
+                         'repomd_url': 'http://mirror.centos.org/centos/6.10/os/{base_architecture}/repodata/repomd.xml',  # noqa
                          'host_machine': '{architecture}-conda_cos6-linux-gnu',
                          'host_subdir': 'linux-{bits}',
                          'fname_architecture': '{architecture}',