Browse Source

Issue #111: Unsorted combine files has been fixed to return all items.

main
Lakshmi Vyasarajan 13 years ago
parent
commit
a8c545d75a
4 changed files with 9 additions and 4 deletions
  1. +5
    -0
      CHANGELOG.rst
  2. +1
    -1
      README.rst
  3. +2
    -2
      hyde/ext/plugins/combine.py
  4. +1
    -1
      hyde/version.py

+ 5
- 0
CHANGELOG.rst View File

@@ -1,3 +1,8 @@
Version 0.8.5a5
============================================================

* Bug Fix: Unsorted combine files fixed. (Issue #111)

Version 0.8.5a4
============================================================



+ 1
- 1
README.rst View File

@@ -1,4 +1,4 @@
Version 0.8.5a4
Version 0.8.5a5

A brand new **hyde**
====================


+ 2
- 2
hyde/ext/plugins/combine.py View File

@@ -74,8 +74,8 @@ class CombinePlugin(Plugin):
resources = sorted([r for r in walker if any(fnmatch(r.name, f) for f in files)],
key=operator.attrgetter('name'))
else:
resources = dict([(f, r) for f in files for r in walker if fnmatch(r.name, f)])
resources = [resources[f] for f in files if f in resources]
resources = [(f, r) for r in walker for f in files if fnmatch(r.name, f)]
resources = [r[1] for f in files for r in resources if f in r]

if not resources:
self.logger.debug("No resources to combine for [%s]" % resource)


+ 1
- 1
hyde/version.py View File

@@ -3,4 +3,4 @@
Handles hyde version
TODO: Use fabric like versioning scheme
"""
__version__ = '0.8.5a4'
__version__ = '0.8.5a5'

Loading…
Cancel
Save