ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_ddaccess dak@merkel.debian.org sleep 1
}
-function runparts() {
- log "Using run-parts to run scripts in $base/scripts/distmnt"
- run-parts --report $base/scripts/distmnt
+function mirrorpush() {
+ log "Starting the mirrorpush"
+ date -u > /srv/ftp.debian.org/web/mirrorstart
+ echo "Using dak v1" >> /srv/ftp.debian.org/web/mirrorstart
+ echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/mirrorstart
+ sudo -H -u archvsync /home/archvsync/runmirrors > ~dak/runmirrors.log 2>&1 &
}
function i18n2() {
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="punew"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
lockfile "$LOCK_ACCEPTED"
lockfile "$LOCK_NEW"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="overrides"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
rm -f "${NOTICE}"
rm -f "${LOCK_DAILY}"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
GO=(
FUNC="expire"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
GO=(
FUNC="transitionsclean"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
GO=(
FUNC="reports"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
GO=(
FUNC="dm"
ARGS=""
ERR=""
)
-stage $GO
+stage $GO &
GO=(
FUNC="bts"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="merkel2"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
- FUNC="runparts"
- TIME="run-parts"
+ FUNC="mirrorpush"
+ TIME="mirrorpush"
ARGS=""
ERR="false"
)
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="testingsourcelist"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="merkel3"
ARGS=""
ERR="false"
)
-stage $GO
+stage $GO &
GO=(
FUNC="compress"
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "Cc: " + package + "@" + Cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override\nX-Katie: alicia"
+ Subst["__CC__"] = "Cc: " + package + "@" + Cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override"
Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
Subst["__WHOAMI__"] = utils.whoami()
if not Options["No-Mail"] and u.pkg.changes["architecture"].has_key("source"):
u.Subst["__SUITE__"] = " into %s" % (tosuite)
u.Subst["__SUMMARY__"] = summary
- u.Subst["__BCC__"] = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $"
+ u.Subst["__BCC__"] = "X-DAK: dak process-accepted"
if cnf.has_key("Dinstall::Bcc"):
u.Subst["__BCC__"] += "\nBcc: %s" % (cnf["Dinstall::Bcc"])
u.update_subst()
cnf = Config()
- bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $"
+ bcc = "X-DAK: dak process-new"
if cnf.has_key("Dinstall::Bcc"):
u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"])
else:
u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"]
# debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header
- bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $"
+ bcc = "X-DAK: dak process-unchecked"
if cnf.has_key("Dinstall::Bcc"):
u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"])
else:
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie"
+ Subst["__CC__"] = "X-DAK: dak rm"
if carbon_copy:
Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
Subst["__SUITE_LIST__"] = suites_list
--- /dev/null
+from regexes import re_verwithext
+from dak_exceptions import UnknownFormatError
+
+def parse_format(txt):
+ """
+ Parse a .changes Format string into a tuple representation for easy
+ comparison.
+
+ >>> parse_format('1.0')
+ (1, 0)
+ >>> parse_format('8.4 (hardy)')
+ (8, 4, 'hardy')
+
+ If the format doesn't match these forms, raises UnknownFormatError.
+ """
+
+ format = re_verwithext.search(txt)
+
+ if format is None:
+ raise UnknownFormatError, txt
+
+ format = format.groups()
+
+ if format[1] is None:
+ format = int(float(format[0])), 0, format[2]
+ else:
+ format = int(format[0]), int(format[1]), format[2]
+
+ if format[2] is None:
+ format = format[:2]
+
+ return format
+
+def validate_changes_format(format, field):
+ """
+ Validate a tuple-representation of a .changes Format: field. Raises
+ UnknownFormatError if the field is invalid, otherwise return type is
+ undefined.
+ """
+
+ if (format < (1, 5) or format > (1, 8)):
+ raise UnknownFormatError, repr(format)
+
+ if field != 'files' and format < (1, 8):
+ raise UnknownFormatError, repr(format)
self.ensure_all_source_exists()
cnf = Config()
- tagfile = cnf["Dinstall::LintianTags"]
+ tagfile = cnf.get("Dinstall::LintianTags")
+ if tagfile is None:
+ # We don't have a tagfile, so just don't do anything.
+ return
# Parse the yaml file
sourcefile = file(tagfile, 'r')
sourcecontent = sourcefile.read()
if not manual:
self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"]
self.Subst["__MANUAL_REJECT_MESSAGE__"] = ""
- self.Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)\nX-Katie-Rejection: automatic (moo)"
+ self.Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)"
os.write(reason_fd, reject_message)
reject_mail_message = utils.TemplateSubst(self.Subst, rej_template)
else:
self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"]
self.Subst["__REJECT_MESSAGE__"] = self.package_info()
self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"]
- self.Subst["__BCC__"] = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $"
+ self.Subst["__BCC__"] = "X-DAK: dak process-accepted"
if cnf.has_key("Dinstall::Bcc"):
self.Subst["__BCC__"] += "\nBcc: %s" % (cnf["Dinstall::Bcc"])
import re
-from regexes import re_verwithext
from dak_exceptions import UnknownFormatError
srcformats = []
raise UnknownFormatError, "Unknown format %r" % txt
-def parse_format(txt):
- """
- Parse a .changes Format string into a tuple representation for easy
- comparison.
-
- >>> parse_format('1.0')
- (1, 0)
- >>> parse_format('8.4 (hardy)')
- (8, 4, 'hardy')
-
- If the format doesn't match these forms, raises UnknownFormatError.
- """
-
- format = re_verwithext.search(txt)
-
- if format is None:
- raise UnknownFormatError, txt
-
- format = format.groups()
-
- if format[1] is None:
- format = int(float(format[0])), 0, format[2]
- else:
- format = int(format[0]), int(format[1]), format[2]
-
- if format[2] is None:
- format = format[:2]
-
- return format
-
class SourceFormat(type):
def __new__(cls, name, bases, attrs):
klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
if has[key]:
yield "contains source files not allowed in format %s" % cls.name
- @classmethod
- def validate_format(cls, format, is_a_dsc=False, field='files'):
- """
- Raises UnknownFormatError if the specified format tuple is not valid for
- this format (for example, the format (1, 0) is not valid for the
- "3.0 (quilt)" format). Return value is undefined in all other cases.
- """
- pass
-
class FormatOne(SourceFormat):
__metaclass__ = SourceFormat
for msg in super(FormatOne, cls).reject_msgs(has):
yield msg
- @classmethod
- def validate_format(cls, format, is_a_dsc=False, field='files'):
- msg = "Invalid format %s definition: %r" % (cls.name, format)
-
- if is_a_dsc:
- if format != (1, 0):
- raise UnknownFormatError, msg
- else:
- if (format < (1,5) or format > (1,8)):
- raise UnknownFormatError, msg
- if field != "files" and format < (1,8):
- raise UnknownFormatError, msg
-
class FormatThree(SourceFormat):
__metaclass__ = SourceFormat
requires = ('native_tar',)
disallowed = ('orig_tar', 'debian_diff', 'debian_tar', 'more_orig_tar')
- @classmethod
- def validate_format(cls, format, **kwargs):
- if format != (3, 0, 'native'):
- raise UnknownFormatError, "Invalid format %s definition: %r" % \
- (cls.name, format)
-
class FormatThreeQuilt(SourceFormat):
__metaclass__ = SourceFormat
requires = ('orig_tar', 'debian_tar')
disallowed = ('debian_diff', 'native_tar')
-
- @classmethod
- def validate_format(cls, format, **kwargs):
- if format != (3, 0, 'quilt'):
- raise UnknownFormatError, "Invalid format %s definition: %r" % \
- (cls.name, format)
re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource, \
re_is_orig_source
+from formats import parse_format, validate_changes_format
from srcformats import get_format_from_string
from collections import defaultdict
if not changes.has_key(field):
raise NoFilesFieldError
- # Get SourceFormat object for this Format and validate it
- format = get_format_from_string(changes['format'])
- format.validate_format(is_a_dsc=is_a_dsc, field=field)
+ # Validate .changes Format: field
+ validate_changes_format(parse_format(changes['format']), field)
includes_section = (not is_a_dsc) and field == "files"
Various
-------
-* Lintian based automated rejects
- - Have a set of lintian tags each package *must* not have. If it does
- -> reject.
- - If a tag is overriden by the maintainer, do not reject, but put it
- into NEW. If the override is ok note that in a table and dont act on
- it for any future uploads of this package anymore.
- - possibly have two classes of tags. one for "shouldnt happen by
- accident" and one "shouldnt happen". the first gets ignored from us
- if overwritten in the package, the second only us can overwrite.
- - its a suite option in dak, not active for all at once.
+* Implement autosigning, see ftpmaster_autosigning on ftp-master host in text/.
* Throw away all DD uploaded .debs. (Depend on "Lintian based automated
rejects")
- its a suite option, not active for all at once.
- should have all buildd machines under dsa control
-* Implement autosigning, see ftpmaster_autosigning on ftp-master host in text/.
-
* Check TODO.old and move still-valid/useful entries over here.
* need a testsuite _badly_
- needs updateX.py written and then the rest of the code changed to deal
with it.
-* Checkout SQL Alchemy and probably use that for our database layer.
-
-* reject on > or < in a version constraint
-
* use pythonX.Y-tarfile to check orig.tar.gz timestamps too.
* the .dak stuff is fundamentally braindamaged for various reasons, it
--- /dev/null
+#!/usr/bin/env python
+
+import unittest
+
+import os, sys
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from daklib.formats import parse_format, validate_changes_format
+from daklib.dak_exceptions import UnknownFormatError
+
+class ParseFormatTestCase(unittest.TestCase):
+ def assertParse(self, format, expected):
+ self.assertEqual(parse_format(format), expected)
+
+ def assertParseFail(self, format):
+ self.assertRaises(
+ UnknownFormatError,
+ lambda: parse_format(format)
+ )
+
+ def testParse(self):
+ self.assertParse('1.0', (1, 0))
+
+ def testEmpty(self):
+ self.assertParseFail('')
+ self.assertParseFail(' ')
+ self.assertParseFail(' ')
+
+ def textText(self):
+ self.assertParse('1.2 (three)', (1, 2, 'three'))
+ self.assertParseFail('0.0 ()')
+
+class ValidateChangesFormat(unittest.TestCase):
+ def assertValid(self, changes, field='files'):
+ validate_changes_format(changes, field)
+
+ def assertInvalid(self, *args, **kwargs):
+ self.assertRaises(
+ UnknownFormatError,
+ lambda: self.assertValid(*args, **kwargs)
+ )
+
+ ##
+
+ def testBinary(self):
+ self.assertValid((1, 5))
+ self.assertValid((1, 8))
+ self.assertInvalid((1, 0))
+
+ def testRange(self):
+ self.assertInvalid((1, 3))
+ self.assertValid((1, 5))
+ self.assertValid((1, 8))
+ self.assertInvalid((1, 9))
+
+ def testFilesField(self):
+ self.assertInvalid((1, 7), field='notfiles')
+ self.assertValid((1, 8), field='notfiles')
from collections import defaultdict
from daklib import srcformats
+from daklib.formats import parse_format
from daklib.dak_exceptions import UnknownFormatError
class SourceFormatTestCase(unittest.TestCase):
'native_tar': 1,
})
-##
-
-class ParseFormatTestCase(unittest.TestCase):
- def assertParse(self, format, expected):
- self.assertEqual(srcformats.parse_format(format), expected)
-
- def assertParseFail(self, format):
- self.assertRaises(
- UnknownFormatError,
- lambda: srcformats.parse_format(format)
- )
-
- def testParse(self):
- self.assertParse('1.0', (1, 0))
-
- def testEmpty(self):
- self.assertParseFail('')
- self.assertParseFail(' ')
- self.assertParseFail(' ')
-
- def textText(self):
- self.assertParse('1.2 (three)', (1, 2, 'three'))
- self.assertParseFail('0.0 ()')
-
-class ValidateFormatTestCase(unittest.TestCase):
- def assertValid(self, format, **kwargs):
- kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', True)
- self.fmt.validate_format(format, **kwargs)
-
- def assertInvalid(self, *args, **kwargs):
- self.assertRaises(
- UnknownFormatError,
- lambda: self.assertValid(*args, **kwargs),
- )
-
-class ValidateFormatOneTestCase(ValidateFormatTestCase):
- fmt = srcformats.FormatOne
-
- def testValid(self):
- self.assertValid((1, 0))
-
- def testInvalid(self):
- self.assertInvalid((0, 1))
- self.assertInvalid((3, 0, 'quilt'))
-
- ##
-
- def testBinary(self):
- self.assertValid((1, 5), is_a_dsc=False)
- self.assertInvalid((1, 0), is_a_dsc=False)
-
- def testRange(self):
- self.assertInvalid((1, 3), is_a_dsc=False)
- self.assertValid((1, 5), is_a_dsc=False)
- self.assertValid((1, 8), is_a_dsc=False)
- self.assertInvalid((1, 9), is_a_dsc=False)
-
- def testFilesField(self):
- self.assertInvalid((1, 7), is_a_dsc=False, field='notfiles')
- self.assertValid((1, 8), is_a_dsc=False, field='notfiles')
-
-class ValidateFormatThreeTestCase(ValidateFormatTestCase):
- fmt = srcformats.FormatThree
-
- def testValid(self):
- self.assertValid((3, 0, 'native'))
-
- def testInvalid(self):
- self.assertInvalid((1, 0))
- self.assertInvalid((0, 0))
- self.assertInvalid((3, 0, 'quilt'))
-
-class ValidateFormatThreeQuiltTestCase(ValidateFormatTestCase):
- fmt = srcformats.FormatThreeQuilt
-
- def testValid(self):
- self.assertValid((3, 0, 'quilt'))
-
- def testInvalid(self):
- self.assertInvalid((1, 0))
- self.assertInvalid((0, 0))
- self.assertInvalid((3, 0, 'native'))
-
class FormatFromStringTestCase(unittest.TestCase):
def assertFormat(self, txt, klass):
self.assertEqual(srcformats.get_format_from_string(txt), klass)
projects / dak.git / commitdiff