[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Oct 1 03:02:46 MDT 2010
The branch, master has been updated
via 072e310 autobuild: Remove autogen step for projects that have checked in configure.
via 28a3d2e autobuild: Simplify find_git_root.
via b77bcea pidl: Fix handling of typedefs of typedefs.
from 3975203 s3-spoolss: fix do_drv_upgrade_printer() which must have been broken since the days we moved away from fstrings.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 072e3101045ccba1311a7dd3427319f1f1a92f3f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 29 00:52:36 2010 +0000
autobuild: Remove autogen step for projects that have checked in configure.
commit 28a3d2ea3003d2fcabdfff209db945ad9ec86f87
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 29 02:38:18 2010 +0200
autobuild: Simplify find_git_root.
commit b77bcea3525df6360a3a409b3145037e269975aa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 29 02:29:02 2010 +0200
pidl: Fix handling of typedefs of typedefs.
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Typelist.pm | 7 ++++---
script/autobuild.py | 26 +++++++++-----------------
2 files changed, 13 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 3b3920a..238ad83 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -128,14 +128,15 @@ sub getType($)
sub typeIs($$)
{
my ($t,$tt) = @_;
-
+
if (ref($t) eq "HASH") {
return 1 if ($t->{TYPE} eq "TYPEDEF" and $t->{DATA}->{TYPE} eq $tt);
return 1 if ($t->{TYPE} eq $tt);
return 0;
}
- return 1 if (hasType($t) and getType($t)->{TYPE} eq "TYPEDEF" and
- getType($t)->{DATA}->{TYPE} eq $tt);
+ if (hasType($t) and getType($t)->{TYPE} eq "TYPEDEF") {
+ return typeIs(getType($t)->{DATA}, $tt);
+ }
return 0;
}
diff --git a/script/autobuild.py b/script/autobuild.py
index 6f14845..e7a2015 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -24,14 +24,12 @@ tasks = {
"make install",
"TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1" ],
- "source4" : [ "./autogen.sh",
- "./configure.developer ${PREFIX}",
+ "source4" : [ "./configure.developer ${PREFIX}",
"make -j",
"make install",
"TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1" ],
- "source4/lib/ldb" : [ "./autogen-waf.sh",
- "./configure --enable-developer -C ${PREFIX}",
+ "source4/lib/ldb" : [ "./configure --enable-developer -C ${PREFIX}",
"make -j",
"make install",
"make test" ],
@@ -54,8 +52,7 @@ tasks = {
"make install",
"make test" ],
- "lib/tevent" : [ "./autogen-waf.sh",
- "./configure --enable-developer -C ${PREFIX}",
+ "lib/tevent" : [ "./configure --enable-developer -C ${PREFIX}",
"make -j",
"make install",
"make test" ],
@@ -241,19 +238,14 @@ def cleanup():
def find_git_root():
'''get to the top of the git repo'''
- cwd=os.getcwd()
- while os.getcwd() != '/':
- try:
- os.stat(".git")
- ret = os.getcwd()
- os.chdir(cwd)
- return ret
- except:
- os.chdir("..")
- pass
- os.chdir(cwd)
+ p=os.getcwd()
+ while p != '/':
+ if os.path.isdir(os.path.join(p, ".git")):
+ return p
+ p = os.path.abspath(os.path.join(p, '..'))
return None
+
def rebase_tree(url):
print("Rebasing on %s" % url)
run_cmd("git remote add -t master master %s" % url, show=True, dir=test_master)
--
Samba Shared Repository
More information about the samba-cvs
mailing list