diff --git a/common/setup.py b/common/setup.py index 302e1decf..aeb5350e9 100755 --- a/common/setup.py +++ b/common/setup.py @@ -5,7 +5,7 @@ setup( name='pulp_python_common', - version='2.0.3b1', + version='2.0.3b2', packages=find_packages(exclude=['test']), url='http://www.pulpproject.org', license='GPLv2+', diff --git a/docs/conf.py b/docs/conf.py index 7e5a5a857..7e4ceeeef 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ # built documents. # # The short X.Y version. -version = '2.0.3b1' +version = '2.0.3b2' # The full version, including alpha/beta/rc tags. -release = '2.0.3b1' +release = '2.0.3b2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/extensions_admin/setup.py b/extensions_admin/setup.py index 412dbad16..05773f420 100755 --- a/extensions_admin/setup.py +++ b/extensions_admin/setup.py @@ -5,7 +5,7 @@ setup( name='pulp_python_extensions_admin', - version='2.0.3b1', + version='2.0.3b2', packages=find_packages(exclude=['test']), url='http://www.pulpproject.org', license='GPLv2+', diff --git a/plugins/pulp_python/plugins/models.py b/plugins/pulp_python/plugins/models.py index 711099833..046b46c46 100644 --- a/plugins/pulp_python/plugins/models.py +++ b/plugins/pulp_python/plugins/models.py @@ -112,7 +112,10 @@ def from_json(cls, package_data, release, project_data): package_attrs['summary'] = project_data['summary'] package_attrs['filename'] = package_data['filename'] - package_attrs['path'] = package_data['path'] + if package_data.get('path', None): + package_attrs['path'] = package_data['path'] + else: + package_attrs['path'] = package_data['url'] package_attrs['packagetype'] = package_data['packagetype'] package_attrs['md5_digest'] = package_data.get('md5_digest') @@ -237,6 +240,8 @@ def package_url(self, feed_url): :return: download url of package bits :rtype: basestring """ + if self.path.startswith('http'): + return self.path return os.path.join(feed_url, 'packages', self.path) def __repr__(self): diff --git a/plugins/setup.py b/plugins/setup.py index d4b454ec8..078755117 100755 --- a/plugins/setup.py +++ b/plugins/setup.py @@ -5,7 +5,7 @@ setup( name='pulp_python_plugins', - version='2.0.3b1', + version='2.0.3b2', packages=find_packages(exclude=['test', 'test.*']), url='http://www.pulpproject.org', license='GPLv2+',