diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-08-07 11:42:59 (GMT) |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-08-07 11:42:59 (GMT) |
| commit | f65f43afd623479e95da5d6b48edc383b4e054c7 (patch) | |
| tree | 06add069824259989d612e392a132d2622909d70 | |
| parent | ce73a7099296ec501decf1bcd63d3d6fcfab148b (diff) | |
Display PS version in log. #7849
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/config.py.in | 1 | ||||
| -rwxr-xr-x | src/main.py | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 8ffeedc..0a1da87 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AM_PATH_PYTHON AC_CONFIG_FILES([ src/sugar-presence-service + src/config.py ]) AC_CONFIG_FILES([ diff --git a/src/.gitignore b/src/.gitignore index d01b46a..9793242 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1 +1,2 @@ sugar-presence-service +config.py diff --git a/src/Makefile.am b/src/Makefile.am index a93d71e..afee724 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,8 @@ psdata_PYTHON = \ pstest.py \ psutils.py \ server_plugin.py \ - telepathy_plugin.py + telepathy_plugin.py \ + config.py bin_SCRIPTS = sugar-presence-service diff --git a/src/config.py.in b/src/config.py.in new file mode 100644 index 0000000..9ce29e8 --- /dev/null +++ b/src/config.py.in @@ -0,0 +1 @@ +VERSION = "@PACKAGE_VERSION@" diff --git a/src/main.py b/src/main.py index ad6dd71..e923c5f 100755 --- a/src/main.py +++ b/src/main.py @@ -24,6 +24,7 @@ import os from sugar import logger from sugar import env +from config import VERSION _logger = logging.getLogger('s-p-s') @@ -58,6 +59,6 @@ def main(): import presenceservice - _logger.info('Starting presence service...') + _logger.info('Starting presence service %s...' % VERSION) presenceservice.main(test_num, randomize) |