[game-data-packager] 25/51: WantedFile.to_data: Don't include name if unexpanded

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 87498774a3f382175ba69c62bd1139fb781bfd1c
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Dec 27 17:10:21 2017 +0000

    WantedFile.to_data: Don't include name if unexpanded
    
    This means the returned map might be empty. If unexpanded, don't
    output anything in GameData.to_data.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>
---
 game_data_packager/__init__.py | 5 ++++-
 game_data_packager/data.py     | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 47f4f1a..ac71bed 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -365,7 +365,10 @@ class GameData(object):
             return ret
 
         for filename, f in self.files.items():
-            files[filename] = f.to_data(expand=expand)
+            data = f.to_data(expand=expand)
+
+            if data or expand:
+                files[filename] = data
 
         for name, g in self.groups.items():
             groups[name] = g.to_data(expand=expand, files=self.files)
diff --git a/game_data_packager/data.py b/game_data_packager/data.py
index ed58129..4b04cda 100644
--- a/game_data_packager/data.py
+++ b/game_data_packager/data.py
@@ -260,9 +260,10 @@ class WantedFile(HashedFile):
         self._provides = set(value)
 
     def to_data(self, expand=True):
-        ret = {
-            'name': self.name,
-        }
+        ret = {}
+
+        if expand:
+            ret['name'] = self.name
 
         for k in (
                 'alternatives',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git