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

index non-recursive yapılabilsin. (--non-recursive or -R)

Browse Source
This commit is contained in:
Faik Uygur
2006-04-19 13:45:48 +00:00
parent 21e5db065d
commit d2195dd3d1
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+3 -2
View File
@@ -308,7 +308,8 @@ def check(package):
ctx.ui.info("OK", False) ctx.ui.info("OK", False)
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()
if not dirs: if not dirs:
@@ -316,7 +317,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) index.index(repo_dir, skip_sources, non_recursive)
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
+7 -2
View File
@@ -733,6 +733,9 @@ source and binary packages.
self.parser.add_option("-G", "--skip-signing", action="store_true", self.parser.add_option("-G", "--skip-signing", action="store_true",
default=False, default=False,
help=_("do not sign index.")) help=_("do not sign index."))
self.parser.add_option("-R", "--non-recursive", action="store_true",
default=False,
help=_("do not recurse into directories."))
def run(self): def run(self):
@@ -741,12 +744,14 @@ source and binary packages.
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
+3 -1
View File
@@ -86,7 +86,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): def index(self, repo_uri, skip_sources=False, non_recursive=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:
@@ -100,6 +100,8 @@ 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):
for comp in self.components: for comp in self.components: