Merge branch '2014.7' into develop

doc/ref/states/requisites.rst

@@ -202,11 +202,11 @@ a state that has not yet been executed. The state containing the ``prereq``
 requisite is defined as the pre-requiring state. The state specified in the
 ``prereq`` statement is defined as the pre-required state.
 
-When ``prereq`` is called, the pre-required state reports if it expects to
-have any changes. It does this by running the pre-required single state as a
-test-run by enabling ``test=True``. This test-run will return a dictionary
-containing a key named "changes". (See the ``watch`` section above for
-examples of "changes" dictionaries.)
+When a ``prereq`` requisite is evaluated, the pre-required state reports if it
+expects to have any changes. It does this by running the pre-required single
+state as a test-run by enabling ``test=True``. This test-run will return a
+dictionary containing a key named "changes". (See the ``watch`` section above
+for examples of "changes" dictionaries.)
 
 If the "changes" key contains a populated dictionary, it means that the
 pre-required state expects changes to occur when the state is actually

salt/modules/aptpkg.py

@@ -1162,8 +1162,7 @@ def get_repo(repo, **kwargs):
                                             ppa_name, dist)
         else:
             if HAS_SOFTWAREPROPERTIES:
-                repo = softwareproperties.ppa.expand_ppa_line(
-                    repo,
+                repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(
                     __grains__['lsb_distrib_codename'])[0]
             else:
                 repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
@@ -1235,7 +1234,7 @@ def del_repo(repo, **kwargs):
             else:
                 repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
         else:
-            repo = softwareproperties.ppa.expand_ppa_line(repo, dist)[0]
+            repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(dist)[0]
 
     sources = sourceslist.SourcesList()
     repos = [s for s in sources.list if not s.invalid]
@@ -1626,8 +1625,7 @@ def expand_repo_def(repokwargs):
                                             dist)
         else:
             if HAS_SOFTWAREPROPERTIES:
-                repo = softwareproperties.ppa.expand_ppa_line(
-                    repo, dist)[0]
+                repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(dist)[0]
             else:
                 repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
 

salt/runners/state.py

@@ -33,6 +33,12 @@ def over(saltenv='base', os_fn=None):
 
         salt-run state.over base /path/to/myoverstate.sls
     '''
+    salt.utils.warn_until(
+            'Boron',
+            'The state.over runner is on a deprecation path and will be '
+            'removed in Salt Boron. Please migrate to state.orchestrate.'
+            )
+
     stage_num = 0
     try:
         overstate = salt.overstate.OverState(__opts__, saltenv, os_fn)