Merge pull request #30589 from terminalmage/2015.5-2015.8

Merge 2015.5 into 2015.8

doc/conf.py

@@ -406,7 +406,7 @@ epub_publisher = epub_author
 epub_copyright = copyright
 
 epub_scheme = 'URL'
-epub_identifier = 'http://saltstack.org/'
+epub_identifier = 'http://saltstack.com/'
 
 #epub_tocdepth = 3
 

doc/topics/releases/2015.5.10.rst

@@ -0,0 +1,5 @@
+==========================================
+Salt 2015.5.10 Release Notes (In Progress)
+==========================================
+
+In progress, not yet released.

doc/topics/tutorials/quickstart.rst

@@ -71,7 +71,7 @@ ensures that the server has the Apache webserver installed.
 
 .. note::
     For a complete explanation on Salt States, see the `tutorial
-    <http://docs.saltstack.org/en/latest/topics/tutorials/states_pt1.html>`_.
+    <http://docs.saltstack.com/en/latest/topics/tutorials/states_pt1.html>`_.
 
 1. Create the ``top.sls`` file:
 

pkg/smartos/esky/salt-master.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/esky/salt-minion.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/esky/salt-syndic.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-master.xml

@@ -62,7 +62,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-minion.xml

@@ -67,7 +67,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-syndic.xml

@@ -62,7 +62,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-master.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-minion.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-syndic.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

salt/modules/yumpkg.py

@@ -844,7 +844,7 @@ def check_db(*names, **kwargs):
         salt '*' pkg.check_db <package1> <package2> <package3> fromrepo=epel-testing
         salt '*' pkg.check_db <package1> <package2> <package3> disableexcludes=main
     '''
-    normalize = kwargs.pop('normalize') if kwargs.get('normalize') else False
+    normalize = kwargs.pop('normalize', True)
     repo_arg = _get_repo_options(repoquery=True, **kwargs)
     exclude_arg = _get_excludes_option(repoquery=True, **kwargs)
 
@@ -875,14 +875,13 @@ def check_db(*names, **kwargs):
         __context__['pkg._avail'] = avail
 
     ret = {}
-    if names:
-        repoquery_cmd = repoquery_base + ' {0}'.format(" ".join(names))
-        provides = sorted(
-            set(x.name for x in _repoquery_pkginfo(repoquery_cmd))
-        )
     for name in names:
         ret.setdefault(name, {})['found'] = name in avail
         if not ret[name]['found']:
+            repoquery_cmd = '{0} {1}'.format(repoquery_base, name)
+            provides = sorted(
+                set(x.name for x in _repoquery_pkginfo(repoquery_cmd))
+            )
             if name in provides:
                 # Package was not in avail but was found by the repoquery_cmd
                 ret[name]['found'] = True

salt/utils/parsers.py

@@ -110,7 +110,7 @@ class OptionParser(optparse.OptionParser, object):
     usage = '%prog'
 
     epilog = ('You can find additional help about %prog issuing "man %prog" '
-              'or on http://docs.saltstack.org')
+              'or on http://docs.saltstack.com')
     description = None
 
     # Private attributes