Hi,
diff6vsorig.txt replaces _do with _do2 and removes \
diff7vsorig.txt removes print (again)
diff8vsorig.txt fixes length
I have no idea why
subprocess.Popen(['reprepro', '--noskipold', '-Vb',
'/srv/backuppc/repo/debderiver/base', 'processincoming all'])
doesn't work.
['processincoming', 'all'] works.
It took me a while to understand this, but I still don't understand
the cause of the problem.
BTW, both files (orig and sixth ver) output this:
Error parsing /srv/backuppc/repo/debderiver/base/conf/updates, line 1:
Unknown header 'FilterSrcList'!
To ignore unknown fields use --ignore=unknownfield
There have been errors!
I have no time to investigate this, but AFAICT it's only connected with updates.
Cheers
--- debderiver
+++ debderiver_patch6.py
@@ -206,7 +206,7 @@
if os.path.isfile(p):
ext = f.split('.')[-1].lower()
if ext in ('deb', 'dsc', 'udeb'):
- self._do(' '.join(('include' + ext, suite, p)))
+ self._do2(' '.join(('include' + ext, suite, p)))
def _include_thirdparty(self):
"""Recursively include third-party packages."""
@@ -239,11 +239,12 @@
for src_pkg in dist.purge_list:
# Check for operating system name in version.
command = ['-T', 'dsc', 'listfilter', dist.codename,
- '($Source (==' + src_pkg + '), $Version (% *' + \
- self._op_sys.name.lower() + '*))']
+ '($Source (==' + src_pkg + '), $Version (% *' +
+ self._op_sys.name.lower() + '*))']
if not self._do2(command):
# Package version is not ours, it can be deleted.
- self._do(' '.join(('removesrc', dist.codename, src_pkg)))
+ self._do2((' '.join(('removesrc', dist.codename,
+ src_pkg))).split())
def _write_configuration(self):
if os.path.isdir(self._conf_path):
@@ -350,8 +351,8 @@
"""Update the repository."""
self._purge_purge_lists()
- self._do('update')
- self._do('processincoming all')
+ self._do2(['update'])
+ self._do2(['processincoming', 'all'])
self._include_thirdparty()
--- debderiver
+++ debderiver_patch7.py
@@ -380,7 +380,6 @@
sys.exit(1)
for up in ups:
if not isinstance(ups[up], dict):
- print >> sys.stderr, 'Upstream %s, no properties defined.' % up
sys.stderr.write('Upstream %s, no properties defined\n' % up)
sys.exit(1)
for key in ('method', 'suite'):
--- debderiver
+++ debderiver_patch8.py
@@ -368,7 +368,8 @@
sys.exit(1)
# Validate operating system level.
- for key in ('os', 'base_dir', 'description', 'signing_key',
'distributions'):
+ for key in ('os', 'base_dir', 'description', 'signing_key',
+ 'distributions'):
if not main_conf.has_key(key):
sys.stderr.write('Missing key: %s\n' % key)
sys.exit(1)
_______________________________________________
gNewSense-dev mailing list
gNewSense-dev@nongnu.org
https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
