mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-11 02:07:37 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
--- jython-2.1/com/ziclix/python/sql/pipe/Pipe.java.orig 2006-07-29 21:31:34.000000000 +0200
|
|
+++ jython-2.1/com/ziclix/python/sql/pipe/Pipe.java 2006-07-29 21:31:41.000000000 +0200
|
|
@@ -93,7 +93,7 @@
|
|
new Integer(sinkRunner.getCount()) };
|
|
String msg = zxJDBC.getString("inconsistentRowCount", counts);
|
|
|
|
- Py.assert(Py.Zero, Py.newString(msg));
|
|
+ Py.assert_(Py.Zero, Py.newString(msg));
|
|
}
|
|
|
|
return Py.newInteger(sinkRunner.getCount());
|
|
--- jython-2.1/org/python/compiler/CodeCompiler.java.orig 2006-07-29 21:28:47.000000000 +0200
|
|
+++ jython-2.1/org/python/compiler/CodeCompiler.java 2006-07-29 21:30:13.000000000 +0200
|
|
@@ -817,14 +817,14 @@
|
|
node.getChild(1).visit(this);
|
|
if (mrefs.assert2 == 0) {
|
|
mrefs.assert2 = code.pool.Methodref(
|
|
- "org/python/core/Py", "assert",
|
|
+ "org/python/core/Py", "assert_",
|
|
"(" + $pyObj + $pyObj + ")V");
|
|
}
|
|
code.invokestatic(mrefs.assert2);
|
|
} else {
|
|
if (mrefs.assert1 == 0) {
|
|
mrefs.assert1 = code.pool.Methodref(
|
|
- "org/python/core/Py", "assert",
|
|
+ "org/python/core/Py", "assert_",
|
|
"(" + $pyObj + ")V");
|
|
}
|
|
code.invokestatic(mrefs.assert1);
|
|
--- jython-2.1/org/python/core/Py.java.orig 2006-07-29 21:29:19.000000000 +0200
|
|
+++ jython-2.1/org/python/core/Py.java 2006-07-29 21:30:40.000000000 +0200
|
|
@@ -986,14 +986,14 @@
|
|
|
|
|
|
/* Equivalent to Python's assert statement */
|
|
- public static void assert(PyObject test, PyObject message) {
|
|
+ public static void assert_(PyObject test, PyObject message) {
|
|
if (!test.__nonzero__()) {
|
|
throw new PyException(Py.AssertionError, message);
|
|
}
|
|
}
|
|
|
|
- public static void assert(PyObject test) {
|
|
- assert(test, Py.None);
|
|
+ public static void assert_(PyObject test) {
|
|
+ assert_(test, Py.None);
|
|
}
|
|
|
|
/* Helpers to implement finally clauses */
|