diff options
| -rw-r--r-- | rpkid/Makefile.in | 7 | ||||
| -rw-r--r-- | rpkid/myrpki.rng | 2 | ||||
| -rw-r--r-- | rpkid/rpki/relaxng.py | 2 | ||||
| -rw-r--r-- | rpkid/tests/smoketest.py | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index bb177cc5..51dad9e5 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -41,7 +41,7 @@ SETUP_PY = \ POW_SO = rpki/POW/_POW.so -SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki \ +SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ pubd rootd rpkic rpkid \ portal-gui/scripts/rpkigui-rcynic \ portal-gui/scripts/rpkigui-import-routes @@ -126,7 +126,7 @@ tags: Makefile find . -type f \( -name '*.py' -o -name '*.sql' -o -name '*.rnc' -o -name '*.py.in' \) ! -name relaxng.py ! -name sql_schemas.py ! -name __doc__.py | etags - lint: - pylint --rcfile ${abs_top_srcdir}/buildtools/pylint.rc rpki/[a-z]*.py *d.py rpki-*.py myrpki.py rpkic.py irbe_cli.py tests/*.py + pylint --rcfile ${abs_top_srcdir}/buildtools/pylint.rc rpki/[a-z]*.py *d.py rpki-*.py rpkic.py irbe_cli.py tests/*.py # Documentation @@ -227,9 +227,6 @@ irbe_cli: irbe_cli.py irdbd: irdbd.py ${COMPILE_PYTHON} -myrpki: myrpki.py - ${COMPILE_PYTHON} - pubd: pubd.py ${COMPILE_PYTHON} diff --git a/rpkid/myrpki.rng b/rpkid/myrpki.rng index 5f59e114..5893f1e5 100644 --- a/rpkid/myrpki.rng +++ b/rpkid/myrpki.rng @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: myrpki.rnc 3723 2011-03-14 20:43:16Z sra $ + $Id: myrpki.rnc 4415 2012-04-15 04:42:40Z sra $ RelaxNG Schema for MyRPKI XML messages. diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py index eed3ca2c..bbe52eb5 100644 --- a/rpkid/rpki/relaxng.py +++ b/rpkid/rpki/relaxng.py @@ -1843,7 +1843,7 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en ## Parsed RelaxNG myrpki schema myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: myrpki.rnc 3723 2011-03-14 20:43:16Z sra $ + $Id: myrpki.rnc 4415 2012-04-15 04:42:40Z sra $ RelaxNG Schema for MyRPKI XML messages. diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index 3cb90d11..acc483c7 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -715,7 +715,7 @@ class allocation(object): try: cur.execute(sql) except Exception: - if not sql.upper().startswith("DROP TABLE"): + if "DROP TABLE IF EXISTS" not in sql.upper(): raise db.close() db = MySQLdb.connect(user = "irdb", db = self.irdb_db_name, passwd = irdb_db_pass) @@ -725,7 +725,7 @@ class allocation(object): try: cur.execute(sql) except Exception: - if not sql.upper().startswith("DROP TABLE"): + if "DROP TABLE IF EXISTS" not in sql.upper(): raise for s in [self] + self.hosts: for kid in s.kids: |