[software/rpm/rpm-setup] 02/02: 2.6

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/rpm/rpm-setup.

commit 17a51f4b353f1fe6845b17064c1162237b2894ed
Author: Pascal Terjan <pterjan-***@public.gmane.org>
Date: Tue Oct 14 20:50:58 2014 +0000

2.6
---
Commit Link:
http://gitweb.mageia.org/software/rpm/rpm-setup/commit/?id=17a51f4b353f1fe6845b17064c1162237b2894ed

NEWS | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index fb3c0c1..8d7a355 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Version 2.6 - 14 October 2014, by Pascal Terjan
+
- support being passed the egg-info directory

Version 2.5 - 1 October 2014, by Thierry Vignaud
diff --git a/configure.ac b/configure.ac
index d2e4b95..3a1f9fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $

AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 2.5, https://bugs.mageia.org/)
+AC_INIT(rpm-mageia-setup, 2.6, https://bugs.mageia.org/)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/rpm/rpm-setup.

commit c4ab8fc45f49e5490f6193c99fb945cc95961023
Author: Pascal Terjan <pterjan-***@public.gmane.org>
Date: Tue Oct 14 20:49:00 2014 +0000

Support being passed the egg-info directory
---
Commit Link:
http://gitweb.mageia.org/software/rpm/rpm-setup/commit/?id=c4ab8fc45f49e5490f6193c99fb945cc95961023

NEWS | 2 ++
pythoneggs.py | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 007b65f..fb3c0c1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- support being passed the egg-info directory
+
Version 2.5 - 1 October 2014, by Thierry Vignaud

- do not emit PHP requires for package's own files
diff --git a/pythoneggs.py b/pythoneggs.py
index 23a595f..367aad1 100755
--- a/pythoneggs.py
+++ b/pythoneggs.py
@@ -88,7 +88,10 @@ for f in files:
metadata = PathMetadata(path_item, parent_name)
else:
path_item = f
- metadata = FileMetadata(f)
+ if isdir(f):
+ metadata = PathMetadata(parent_name, f)
+ else:
+ metadata = FileMetadata(f)
dist = Distribution.from_location(path_item, dist_name, metadata)
if not dist.py_version:
continue