Imported Upstream version 5.3.1

diff --git a/ChangeLog b/ChangeLog
index 714ad170a45394bf6760d668f8c397912a7f8199..164fc71f53ab29018cd761659f6c2411bf1ec398 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
 CHANGES
 =======
 
+5.3.1
+-----
+
+
 5.3.0
 -----
 
 * Stop using pbr sphinx integration
 * Switch to release.o.o for constraints
 * Make WSGI tests listen on localhost
+* Fix Windows support
 * Allow git-tags to be SemVer compliant
 * Read description file as utf-8
 
@@ -16,6 +21,7 @@ CHANGES
 * Add openstack-tox-py37 job
 * Set subparser argument required
 * Remove neutron-lbaas
+* Install more dependencies for integration testing
 * Update Sphinx requirement
 * Fix white space handling in file names
 

diff --git a/PKG-INFO b/PKG-INFO
index cc289378540114d8dfc75fa3aed9f2dc0c56f906..90bf15e37c28a66916023148098fc2c83a3355c5 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 5.3.0
+Version: 5.3.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index cc289378540114d8dfc75fa3aed9f2dc0c56f906..90bf15e37c28a66916023148098fc2c83a3355c5 100644 (file)
--- a/pbr.egg-info/PKG-INFO
+++ b/pbr.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 5.3.0
+Version: 5.3.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr/hooks/files.py b/pbr/hooks/files.py
index 0fe0df5522e8889b4a13cb9759b5705c54bfad3f..c44af7c4c93db760e152bbb29a62c8cb72e16ab0 100644 (file)
--- a/pbr/hooks/files.py
+++ b/pbr/hooks/files.py
@@ -41,6 +41,13 @@ def unquote_path(path):
     # strip the quotes off individual path components because os.walk cannot
     # handle paths like: "'i like spaces'/'another dir'", so we will pass it
     # "i like spaces/another dir" instead.
+
+    if os.name == 'nt':
+        # shlex cannot handle paths that contain backslashes, treating those
+        # as escape characters.
+        path = path.replace("\\", "/")
+        return "".join(shlex.split(path)).replace("/", "\\")
+
     return "".join(shlex.split(path))
 
 

diff --git a/pbr/util.py b/pbr/util.py
index 323747e4e1bb3b84b073a1f414ade4d2fcf44ca4..6b2e87d7d2f638f438592d0971ec2015644b602f 100644 (file)
--- a/pbr/util.py
+++ b/pbr/util.py
@@ -162,6 +162,16 @@ BOOL_FIELDS = ("use_2to3", "zip_safe", "include_package_data")
 CSV_FIELDS = ()
 
 
+def shlex_split(path):
+    if os.name == 'nt':
+        # shlex cannot handle paths that contain backslashes, treating those
+        # as escape characters.
+        path = path.replace("\\", "/")
+        return [x.replace("/", "\\") for x in shlex.split(path)]
+
+    return shlex.split(path)
+
+
 def resolve_name(name):
     """Resolve a name like ``module.object`` to an object and return it.
 
@@ -374,22 +384,22 @@ def setup_cfg_to_setup_kwargs(config, script_args=()):
                 for line in in_cfg_value:
                     if '=' in line:
                         key, value = line.split('=', 1)
-                        key_unquoted = shlex.split(key.strip())[0]
+                        key_unquoted = shlex_split(key.strip())[0]
                         key, value = (key_unquoted, value.strip())
                         if key in data_files:
                             # Multiple duplicates of the same package name;
                             # this is for backwards compatibility of the old
                             # format prior to d2to1 0.2.6.
                             prev = data_files[key]
-                            prev.extend(shlex.split(value))
+                            prev.extend(shlex_split(value))
                         else:
-                            prev = data_files[key.strip()] = shlex.split(value)
+                            prev = data_files[key.strip()] = shlex_split(value)
                     elif firstline:
                         raise errors.DistutilsOptionError(
                             'malformed package_data first line %r (misses '
                             '"=")' % line)
                     else:
-                        prev.extend(shlex.split(line.strip()))
+                        prev.extend(shlex_split(line.strip()))
                     firstline = False
                 if arg == 'data_files':
                     # the data_files value is a pointlessly different structure

diff --git a/tools/integration.sh b/tools/integration.sh
index 3b431e141692c09588d5499b76d5c68e7d87ab38..6c4dc16ea46b90bd5a05e67e3a464b722cefc01f 100644 (file)
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -30,7 +30,7 @@ REPODIR=${REPODIR:-$BASE/new}
 
 # TODO: Figure out how to get this on to the box properly
 sudo apt-get update
-sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev liberasurecode-dev libjpeg-dev
+sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev liberasurecode-dev libjpeg-dev libsystemd-dev libnss3-dev libssl-dev
 
 # FOR numpy / pyyaml
 # The source list has been removed from our apt config so rather than