aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarHeinrich Schuchardt <xypron.glpk@gmx.de>2015-09-06 01:18:52 +0200
committerLibravatarKrytarik Raido <krytarik@tuxgarage.com>2019-07-17 02:04:04 +0200
commit96702ad68c5ba1061a54273ff8a4eda548682604 (patch)
tree9d2accfde0f624a77ebf29d697b02430179c37a3
parent91ad709de018d524a241d796da1698eaf9206e68 (diff)
downloadmini-dinstall-96702ad68c5ba1061a54273ff8a4eda548682604.tar.bz2
mini-dinstall-96702ad68c5ba1061a54273ff8a4eda548682604.tar.xz
mini-dinstall-96702ad68c5ba1061a54273ff8a4eda548682604.tar.zst
Create Release file for source subdirectory.
Closes: #798121
-rwxr-xr-xmini-dinstall17
1 files changed, 10 insertions, 7 deletions
diff --git a/mini-dinstall b/mini-dinstall
index 9874ee8..f0f8ce4 100755
--- a/mini-dinstall
+++ b/mini-dinstall
@@ -1029,7 +1029,7 @@ class ArchiveDir:
class SimpleSubdirArchiveDir(ArchiveDir):
def __init__(self, *args, **kwargs):
ArchiveDir.__init__(*[self] + list(args), **kwargs)
- for arch in list(self._arches) + ['source']:
+ for arch in self._arches + ['source']:
target = os.path.join(self._dir, arch)
do_mkdir(target)
@@ -1212,7 +1212,7 @@ class ArchiveDirIndexer(threading.Thread):
self._logger.info('Created new thread (%s) for archive indexer %s' % (self.getName(), self._name))
self._logger.info('Entering batch mode...')
try:
- self._index_all(1)
+ self._index_all(True)
self._gen_release_all(True)
if not self._batch_mode:
# never returns
@@ -1271,7 +1271,7 @@ class ArchiveDirIndexer(threading.Thread):
continue
if not dir:
self._logger.debug('Got general change')
- self._index_all(1)
+ self._index_all(True)
self._gen_release_all(True)
else:
self._logger.debug('Got change in %s' % dir)
@@ -1295,7 +1295,7 @@ class ArchiveDirIndexer(threading.Thread):
self._index_impl(arches, force)
def _gen_release(self, arches, force=False):
- self._gen_release_impl(self._arches, force)
+ self._gen_release_impl(arches, force)
def wait_reprocess(self):
e = threading.Event()
@@ -1314,7 +1314,7 @@ class ArchiveDirIndexer(threading.Thread):
class SimpleSubdirArchiveDirIndexer(ArchiveDirIndexer):
def __init__(self, *args, **kwargs):
ArchiveDirIndexer.__init__(*[self] + list(args), **kwargs)
- for arch in list(self._arches) + ['source']:
+ for arch in self._arches + ['source']:
target = os.path.join(self._dir, arch)
do_mkdir(target)
@@ -1339,7 +1339,7 @@ class SimpleSubdirArchiveDirIndexer(ArchiveDirIndexer):
self._logger.info('Skipping generation of Sources file for %s' % arch)
def _gen_release_impl(self, arches, force=False):
- for arch in arches:
+ for arch in arches + ['source']:
targetname = self._relpath(arch, 'Release')
if not self._generate_release:
if os.access(targetname, os.R_OK):
@@ -1350,7 +1350,10 @@ class SimpleSubdirArchiveDirIndexer(ArchiveDirIndexer):
pass
return
tmpname = targetname + tmp_new_suffix
- uncompr_indexfile = os.path.join(arch, 'Packages')
+ if arch != 'source':
+ uncompr_indexfile = os.path.join(arch, 'Packages')
+ else:
+ uncompr_indexfile = os.path.join(arch, 'Sources')
indexfiles = [uncompr_indexfile]
comprexts = ['.xz']
for ext in comprexts: