From 5f4c09fa1f4b09126e1a16e78044c64e97828530 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 22 Jun 2009 22:36:36 +0000 Subject: Python 2.4 and 2.6 improvements The sets module is no longer needed with Python 2.4, and causes a DeprecationWarning with 2.6, so drop it The md5 module causes a DeprecationWarning with 2.6, so try to import hashlib (its replacement) instead, else fall back Reviewed by Poppy. --- scripts/install.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/install.py b/scripts/install.py index 6278fba16c..78b8880b95 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -64,7 +64,6 @@ def add_indra_lib_path(): base_dir = add_indra_lib_path() import copy -import md5 import optparse import os import platform @@ -75,7 +74,12 @@ import tempfile import urllib2 import urlparse -from sets import Set as set, ImmutableSet as frozenset +try: + # Python 2.6 + from hashlib import md5 +except ImportError: + # Python 2.5 and earlier + from md5 import new as md5 from indra.base import llsd from indra.util import helpformatter @@ -106,7 +110,7 @@ class InstallFile(object): return "ifile{%s:%s}" % (self.pkgname, self.url) def _is_md5sum_match(self): - hasher = md5.new(file(self.filename, 'rb').read()) + hasher = md5(file(self.filename, 'rb').read()) if hasher.hexdigest() == self.md5sum: return True return False -- cgit v1.2.3 From 17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 24 Jul 2009 00:46:26 +0000 Subject: For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]" svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions. --- scripts/messages/message_template.msg | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'scripts') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 23efd65c45..67233cbda0 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -8945,3 +8945,21 @@ version 2.0 { CRC U32 } } } + +{ + LinkInventoryItem Low 426 NotTrusted Zerocoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { + InventoryData Variable + { CallbackID U32 } // Async Response + { FolderID LLUUID } + { OldItemID LLUUID } + { Name Variable 1 } + { AssetType U8 } + } +} + -- cgit v1.2.3 From 2c31217cc97938fd4bc482a888410dec59f54ddb Mon Sep 17 00:00:00 2001 From: Dave Simmons Date: Wed, 29 Jul 2009 17:36:46 +0000 Subject: svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4 Pulled all the sisa changes into trunk for QAR-1734 These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2 or the one merge branch in svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3 --- scripts/messages/message_template.msg | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 67233cbda0..9deab1f857 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -5288,6 +5288,10 @@ version 2.0 { AgentLegacyAccess U8 } { AgentMaxAccess U8 } } + { + AgentInfo Variable + { Flags U32 } + } } // ChildAgentAlive -- cgit v1.2.3 From ff11d74820c89822cd067b51727d9df1dc87d0d0 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 26 Aug 2009 10:57:38 -0700 Subject: Add Mercurial-specific build version info. Pilfered from billc. --- scripts/update_version_files.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'scripts') diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py index 9081941521..ee1ce69a15 100755 --- a/scripts/update_version_files.py +++ b/scripts/update_version_files.py @@ -241,23 +241,17 @@ def main(): if update_server: server_version = new_version else: - # Assume we're updating just the build number - cl = '%s info "%s"' % (svn, src_root) - status, output = _getstatusoutput(cl) - if verbose: - print - print "svn info output:" - print "----------------" - print output - - branch_match = svn_branch_re.search(output) - revision_match = svn_revision_re.search(output) - if not branch_match or not revision_match: - print "Failed to execute svn info, output follows:" - print output + + if llversion.using_svn(): + revision = llversion.get_svn_revision() + branch = llversion.get_svn_branch() + elif llversion.using_hg(): + revision = llversion.get_hg_changeset() + branch = llversion.get_hg_repo() + else: + print >>sys.stderr, "ERROR: could not determine revision and branch" return -1 - branch = branch_match.group(1) - revision = revision_match.group(1) + if skip_on_branch_re and skip_on_branch_re.match(branch): print "Release Candidate Build, leaving version files untouched." return 0 -- cgit v1.2.3 From 74e584add651adbb5784276aba5770de9e295846 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Fri, 4 Sep 2009 18:16:21 +0000 Subject: svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30 Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804 --- scripts/messages/message_template.msg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 9deab1f857..e1b01c569b 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -8950,6 +8950,7 @@ version 2.0 } } +// Link inventory { LinkInventoryItem Low 426 NotTrusted Zerocoded { @@ -8958,12 +8959,16 @@ version 2.0 { SessionID LLUUID } } { - InventoryData Variable + InventoryBlock Single { CallbackID U32 } // Async Response { FolderID LLUUID } + { TransactionID LLUUID } // Going to become TransactionID { OldItemID LLUUID } + { Type S8 } + { InvType S8 } { Name Variable 1 } - { AssetType U8 } + { Description Variable 1 } + } } -- cgit v1.2.3