Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* go go go

Browse Source
This commit is contained in:
Faik Uygur
2006-09-24 18:50:18 +00:00
parent 087ad49aa0
commit 798f4f7529
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+2 -3
View File
@@ -325,8 +325,7 @@ def check(package):
ctx.ui.info(_("OK"), verbose=True) ctx.ui.info(_("OK"), verbose=True)
return corrupt return corrupt
def index(dirs=None, output='pisi-index.xml', skip_sources=False, skip_signing=False, def index(dirs=None, output='pisi-index.xml', skip_sources=False, skip_signing=False):
non_recursive=False):
"""accumulate PiSi XML files in a directory""" """accumulate PiSi XML files in a directory"""
index = Index() index = Index()
index.distribution = None index.distribution = None
@@ -335,7 +334,7 @@ def index(dirs=None, output='pisi-index.xml', skip_sources=False, skip_signing=F
for repo_dir in dirs: for repo_dir in dirs:
repo_dir = str(repo_dir) repo_dir = str(repo_dir)
ctx.ui.info(_('* Building index of PiSi files under %s') % repo_dir) ctx.ui.info(_('* Building index of PiSi files under %s') % repo_dir)
index.index(repo_dir, skip_sources, non_recursive) index.index(repo_dir, skip_sources)
if skip_signing: if skip_signing:
index.write(output, sha1sum=True, compress=File.bz2, sign=None) index.write(output, sha1sum=True, compress=File.bz2, sign=None)
pisi/cli/commands.py
+4 -9
View File
@@ -896,15 +896,12 @@ everything in a single index file.
group.add_option("-o", "--output", action="store", group.add_option("-o", "--output", action="store",
default='pisi-index.xml', default='pisi-index.xml',
help=_("index output file")) help=_("index output file"))
group.add_option("-S", "--skip-sources", action="store_true", group.add_option("--skip-sources", action="store_true",
default=False, default=False,
help=_("do not index pisi spec files.")) help=_("do not index pisi spec files."))
group.add_option("-G", "--skip-signing", action="store_true", group.add_option("--skip-signing", action="store_true",
default=False, default=False,
help=_("do not sign index.")) help=_("do not sign index."))
group.add_option("-R", "--non-recursive", action="store_true",
default=False,
help=_("do not recurse into directories."))
self.parser.add_option_group(group) self.parser.add_option_group(group)
@@ -915,14 +912,12 @@ everything in a single index file.
if len(self.args)>0: if len(self.args)>0:
index(self.args, ctx.get_option('output'), index(self.args, ctx.get_option('output'),
skip_sources = ctx.get_option('skip_sources'), skip_sources = ctx.get_option('skip_sources'),
skip_signing = ctx.get_option('skip_signing'), skip_signing = ctx.get_option('skip_signing'))
non_recursive = ctx.get_option('non_recursive'))
elif len(self.args)==0: elif len(self.args)==0:
ctx.ui.info(_('Indexing current directory.')) ctx.ui.info(_('Indexing current directory.'))
index(['.'], ctx.get_option('output'), index(['.'], ctx.get_option('output'),
skip_sources = ctx.get_option('skip_sources'), skip_sources = ctx.get_option('skip_sources'),
skip_signing = ctx.get_option('skip_signing'), skip_signing = ctx.get_option('skip_signing'))
non_recursive = ctx.get_option('non_recursive'))
self.finalize() self.finalize()
pisi/index.py
+1 -3
View File
@@ -84,7 +84,7 @@ class Index(XmlFile):
tmpdir = os.path.join(ctx.config.index_dir(), repo) tmpdir = os.path.join(ctx.config.index_dir(), repo)
File.check_signature(filename, tmpdir) File.check_signature(filename, tmpdir)
def index(self, repo_uri, skip_sources=False, non_recursive=False): def index(self, repo_uri, skip_sources=False):
self.repo_dir = repo_uri self.repo_dir = repo_uri
for root, dirs, files in os.walk(repo_uri): for root, dirs, files in os.walk(repo_uri):
for fn in files: for fn in files:
@@ -98,8 +98,6 @@ class Index(XmlFile):
self.add_spec(os.path.join(root, fn), repo_uri) self.add_spec(os.path.join(root, fn), repo_uri)
if fn == 'distribution.xml': if fn == 'distribution.xml':
self.add_distro(os.path.join(root, fn)) self.add_distro(os.path.join(root, fn))
if non_recursive:
del dirs[0:]
def update_db(self, repo, txn = None): def update_db(self, repo, txn = None):
ctx.componentdb.remove_repo(repo, txn=txn) ctx.componentdb.remove_repo(repo, txn=txn)