Merge tag '1.8.0' into debian/kilo

oslo.concurrency 1.8.0 release

oslo.concurrency/locale/fr/LC_MESSAGES/oslo.concurrency-log-error.po

@@ -0,0 +1,32 @@
+# Translations template for oslo.concurrency.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the oslo.concurrency
+# project.
+#
+# Translators:
+# Maxime COQUEREL <max.coquerel@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.concurrency\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-03-09 06:08+0000\n"
+"PO-Revision-Date: 2015-03-08 16:34+0000\n"
+"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/osloconcurrency/"
+"language/fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: oslo_concurrency/lockutils.py:217
+#, python-format
+msgid "Could not unlock the acquired lock `%s`"
+msgstr "Impossible de libérer le verrou acquis %s"
+
+#: oslo_concurrency/lockutils.py:223
+#, python-format
+msgid "Could not close the acquired file handle `%s`"
+msgstr "Impossible de libérer le descripteur de fichier %s"

oslo.concurrency/locale/fr/LC_MESSAGES/oslo.concurrency-log-info.po

@@ -0,0 +1,32 @@
+# Translations template for oslo.concurrency.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the oslo.concurrency
+# project.
+#
+# Translators:
+# Maxime COQUEREL <max.coquerel@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.concurrency\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-03-09 06:08+0000\n"
+"PO-Revision-Date: 2015-03-08 16:35+0000\n"
+"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/osloconcurrency/"
+"language/fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: oslo_concurrency/lockutils.py:181
+#, python-format
+msgid "Created lock path: %s"
+msgstr "Chemin de verrou créé %s"
+
+#: oslo_concurrency/lockutils.py:332
+#, python-format
+msgid "Failed to remove file %(file)s"
+msgstr "Échec lors de la suppression du fichier  %(file)s"

oslo.concurrency/locale/fr/LC_MESSAGES/oslo.concurrency.po

@@ -0,0 +1,123 @@
+# French translations for oslo.concurrency.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the oslo.concurrency
+# project.
+#
+# Translators:
+# Maxime COQUEREL <max.coquerel@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version:  oslo.concurrency\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-03-09 06:08+0000\n"
+"PO-Revision-Date: 2015-03-08 16:41+0000\n"
+"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
+"Language-Team: French "
+"(http://www.transifex.com/projects/p/osloconcurrency/language/fr/)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: oslo_concurrency/lockutils.py:111
+#, python-format
+msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s"
+msgstr ""
+"Impossible d'acquérir le verrou sur `%(filename)s` à cause de "
+"%(exception)s"
+
+#: oslo_concurrency/lockutils.py:208
+msgid "Unable to release an unacquired lock"
+msgstr "Impossible de libérer le verrou acquis %s"
+
+#: oslo_concurrency/lockutils.py:671
+msgid ""
+"Calling lockutils directly is no longer supported.  Please use the "
+"lockutils-wrapper console script instead."
+msgstr ""
+"Lockutils appelant directement n'est plus pris en charge. Merci "
+"d'utiliser le script de la console lockutils -wrapper à la place."
+
+#: oslo_concurrency/processutils.py:69
+msgid "Unexpected error while running command."
+msgstr "Erreur inattendue lors de l’exécution de la commande."
+
+#: oslo_concurrency/processutils.py:72
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+"%(description)s\n"
+"Commande: %(cmd)s\n"
+"Code de sortie: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+
+#: oslo_concurrency/processutils.py:174
+#, python-format
+msgid "Got unknown keyword args: %r"
+msgstr "Ags, mot clé inconnu: %r"
+
+#: oslo_concurrency/processutils.py:177
+#, python-format
+msgid "Got invalid arg log_errors: %r"
+msgstr "Argument reçu non valide log_errors: %r"
+
+#: oslo_concurrency/processutils.py:183
+msgid "Command requested root, but did not specify a root helper."
+msgstr "La commande exigeait root, mais n'indiquait pas comment obtenir root."
+
+#: oslo_concurrency/processutils.py:199
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr "Exécution de la commande (sous-processus): %s"
+
+#: oslo_concurrency/processutils.py:242
+#, python-format
+msgid ""
+"%(desc)r\n"
+"command: %(cmd)r\n"
+"exit code: %(code)r\n"
+"stdout: %(stdout)r\n"
+"stderr: %(stderr)r"
+msgstr ""
+"%(desc)r\n"
+"commande: %(cmd)r\n"
+"Code de sortie: %(code)r\n"
+"stdout: %(stdout)r\n"
+"stderr: %(stderr)r"
+
+#: oslo_concurrency/processutils.py:251
+#, python-format
+msgid ""
+"Got an OSError\n"
+"command: %(cmd)r\n"
+"errno: %(errno)r"
+msgstr ""
+"Erreur du Système\n"
+"commande: %(cmd)r\n"
+"errno: %(errno)r"
+
+#: oslo_concurrency/processutils.py:257
+#, python-format
+msgid "%r failed. Not Retrying."
+msgstr "Echec de %r. Nouvelle tentative."
+
+#: oslo_concurrency/processutils.py:261
+#, python-format
+msgid "%r failed. Retrying."
+msgstr "Echec de %r. Nouvelle tentative."
+
+#: oslo_concurrency/processutils.py:308
+msgid "Environment not supported over SSH"
+msgstr "Environnement non prise en charge sur SSH"
+
+#: oslo_concurrency/processutils.py:312
+msgid "process_input not supported over SSH"
+msgstr "process_input non pris en charge sur SSH"
+

oslo_concurrency/lockutils.py

@@ -53,8 +53,12 @@ _opts = [
 ]
 
 
+def _register_opts(conf):
+    conf.register_opts(_opts, group='oslo_concurrency')
+
+
 CONF = cfg.CONF
-CONF.register_opts(_opts, group='oslo_concurrency')
+_register_opts(CONF)
 
 
 def set_defaults(lock_path):
@@ -65,6 +69,16 @@ def set_defaults(lock_path):
     cfg.set_defaults(_opts, lock_path=lock_path)
 
 
+def get_lock_path(conf):
+    """Return the path used for external file-based locks.
+
+    :param conf: Configuration object
+    :type conf: oslo_config.cfg.ConfigOpts
+    """
+    _register_opts(conf)
+    return conf.oslo_concurrency.lock_path
+
+
 class _Hourglass(object):
     """A hourglass like periodic timer."""
 

oslo_concurrency/openstack/common/fileutils.py

@@ -19,7 +19,7 @@ import logging
 import os
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 

oslo_concurrency/tests/unit/test_lockutils.py

@@ -898,3 +898,20 @@ class TestLockFixture(test_base.BaseTestCase):
         fixture = fixtures.LockFixture('test-lock')
         self.useFixture(fixture)
         self.lock = fixture.lock
+
+
+class TestGetLockPath(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(TestGetLockPath, self).setUp()
+        self.conf = self.useFixture(config.Config(lockutils.CONF)).conf
+
+    def test_get_default(self):
+        lockutils.set_defaults(lock_path='/the/path')
+        self.assertEqual('/the/path', lockutils.get_lock_path(self.conf))
+
+    def test_get_override(self):
+        lockutils._register_opts(self.conf)
+        self.conf.set_override('lock_path', '/alternate/path',
+                               group='oslo_concurrency')
+        self.assertEqual('/alternate/path', lockutils.get_lock_path(self.conf))

requirements.txt

@@ -6,7 +6,7 @@ pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 iso8601>=0.1.9
 fixtures>=0.3.14
-oslo.config>=1.6.0  # Apache-2.0
+oslo.config>=1.9.0  # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0
 oslo.utils>=1.2.0                       # Apache-2.0
 posix_ipc

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py33,py34,py26,py27,pep8
+envlist = py34,py26,py27,pep8
 # NOTE(dhellmann): We cannot set skipdist=True
 # for oslo libraries because of the namespace package.
 #skipsdist = True