[game-data-packager] 20/21: Don't search the same path more than once

[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 cfe0c617c9134eb42376460e06489875f6bd8b8a
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jan 21 11:20:28 2015 +0000

    Don't search the same path more than once
---
 lib/game_data_packager/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index 2006229..b94d45e 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1740,7 +1740,7 @@ class GameData(object):
     def look_for_files(self, paths=(), search=True, packages=None):
         paths = list(paths)
 
-        if self.save_downloads is not None:
+        if self.save_downloads is not None and self.save_downloads not in paths:
             paths.append(self.save_downloads)
 
         if packages is None:
@@ -1748,19 +1748,20 @@ class GameData(object):
 
         if search:
             for path in self.try_repack_from:
-                if os.path.isdir(path):
+                if os.path.isdir(path) and path not in paths:
                     paths.append(path)
 
             for package in packages:
                 path = '/' + package.install_to
-                if os.path.isdir(path):
+                if os.path.isdir(path) and path not in paths:
                     paths.append(path)
                 path = '/usr/share/doc/' + package.name
-                if os.path.isdir(path):
+                if os.path.isdir(path) and path not in paths:
                     paths.append(path)
 
             for path in self.iter_steam_paths():
-                paths.append(path)
+                if path not in paths:
+                    paths.append(path)
 
         for arg in paths:
             logger.debug('%s...', arg)

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