summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-04-10 10:53:59 +0000
committeryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-04-10 10:53:59 +0000
commitc5c54d4d6486d85a151c6fcd4c5dcdaf2dfbcaf6 (patch)
treec6206fc6fa56332feda8428a38858a8df48f9714
parentad031278c0e4a4108d5a56d99ddc7ce1030a80a0 (diff)
downloadebus-alt-c5c54d4d6486d85a151c6fcd4c5dcdaf2dfbcaf6.tar.gz
ebus-alt-c5c54d4d6486d85a151c6fcd4c5dcdaf2dfbcaf6.zip
include rev number in egg name
git-svn-id: http://10.2.2.13/svn/common/ebus@1640 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd
-rw-r--r--bin/ebus_dump1
-rw-r--r--dist/ebus-0.2-py2.5.eggbin10134 -> 10151 bytes
-rw-r--r--dist/ebus-0.2_r1638-py2.5.eggbin0 -> 10158 bytes
-rw-r--r--ebus/__init__.py2
-rw-r--r--setup.py12
5 files changed, 13 insertions, 2 deletions
diff --git a/bin/ebus_dump b/bin/ebus_dump
index 01d2ede..3a86ee8 100644
--- a/bin/ebus_dump
+++ b/bin/ebus_dump
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# -*- coding:utf8 -*-
import asyncore
from ebus import EbusReader
diff --git a/dist/ebus-0.2-py2.5.egg b/dist/ebus-0.2-py2.5.egg
index 705a7b2..8a02338 100644
--- a/dist/ebus-0.2-py2.5.egg
+++ b/dist/ebus-0.2-py2.5.egg
Binary files differ
diff --git a/dist/ebus-0.2_r1638-py2.5.egg b/dist/ebus-0.2_r1638-py2.5.egg
new file mode 100644
index 0000000..f86e961
--- /dev/null
+++ b/dist/ebus-0.2_r1638-py2.5.egg
Binary files differ
diff --git a/ebus/__init__.py b/ebus/__init__.py
index 8b75043..94b0b32 100644
--- a/ebus/__init__.py
+++ b/ebus/__init__.py
@@ -253,7 +253,7 @@ class EbusReader(asynchat.async_chat):
#0xaa bug
i = 0
data = ""
- while i < len(dataRaw)+1:
+ while (i+1) < len(dataRaw):
if ord(dataRaw[i]) == 0xaa and ord(dataRaw[i+1]) == 0x01:
data += "\xaa"
i = i + 1
diff --git a/setup.py b/setup.py
index ee95d97..ed47b66 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,20 @@
#!/usr/bin/env python
+version='0.2'
+try:
+ import pysvn
+ from pysvn import Client
+ import os
+ extra = Client().info(os.path.dirname(__file__)).revision.number
+ version = "%s-r%s" % (version,extra)
+except:
+ pass
+
from setuptools import setup, find_packages
setup(
name='ebus',
- version='0.2',
+ version=version,
description='Ebus over TCP Library',
author='xapek.org',
author_email='ebus@xapek.org',