From ad06b95288a27965752a9e620d7eb2114b7d65e8 Mon Sep 17 00:00:00 2001
From: Seblu <sebastien.luttringer@smartjog.com>
Date: Thu, 25 Aug 2011 10:42:58 +0200
Subject: [PATCH] repository on command line are added to the of repostiory in
config file not supersede
---
bin/is | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/is b/bin/is
index bf6da20..6f40c94 100755
--- a/bin/is
+++ b/bin/is
@@ -37,14 +37,14 @@ def load_repositories(args):
# from command line
repoman.register(RepositoryConfig(istools.smd5sum(args.repo_path)[:8],
path=args.repo_path))
- else:
- # from config
- for repoconf in RepoConfigFile(args.repo_config).repos:
- if args.repo_filter is None:
+
+ # from config
+ for repoconf in RepoConfigFile(args.repo_config).repos:
+ if args.repo_filter is None:
+ repoman.register(repoconf)
+ else:
+ if len(fnmatch.filter([repoconf.name], args.repo_filter)) > 0:
repoman.register(repoconf)
- else:
- if len(fnmatch.filter([repoconf.name], args.repo_filter)) > 0:
- repoman.register(repoconf)
return repoman
def select_image(name, repoman):
--
GitLab