Commit graph

438 commits

Author SHA1 Message Date
Nico Schottelius
d5e24492be begin to prepare TypeExplorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:30:38 +02:00
Nico Schottelius
478ee1a096 -senseless comments
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:30:08 +02:00
Nico Schottelius
09209e47d6 ideas for explorer run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:29:53 +02:00
Steven Armstrong
fb80a95555 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:58:09 +02:00
Steven Armstrong
1c38fb492e fixtures for type manifest environment test
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:57:06 +02:00
Steven Armstrong
9a33bd3b90 test type manifest environment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:56:45 +02:00
Nico Schottelius
1aa2c48baf new style classes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:36:00 +02:00
Nico Schottelius
d93d132c05 finish global_explorer (in theory)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:27:21 +02:00
Steven Armstrong
5df8479c5a implement Manifest and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:20:47 +02:00
Steven Armstrong
a254e1f31e return output of command execution as string instead of bytestring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:12:22 +02:00
Nico Schottelius
b8cbf22086 add global and type explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:00:00 +02:00
Nico Schottelius
e8f7fe3faa intermediate commit for cdist state
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 16:59:02 +02:00
Steven Armstrong
78fd611bb0 fix cdist_base_path
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:56:16 +02:00
Steven Armstrong
d2878e931e /Remote/Local/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:50:21 +02:00
Steven Armstrong
5f358a5ef1 move link_emulator to local
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:46:54 +02:00
Steven Armstrong
117ccf94d3 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:13:22 +02:00
Steven Armstrong
424c060934 +FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:21:25 +02:00
Steven Armstrong
985ed2669a local code execution and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:17:06 +02:00
Steven Armstrong
84e044407e +FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:16:33 +02:00
Steven Armstrong
7da3a3c305 remote code execution and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 14:30:10 +02:00
Steven Armstrong
d85118c4c1 Merge remote-tracking branch 'telmich/master' 2011-10-12 08:19:07 +02:00
Nico Schottelius
9f49f99294 use self.log for correct logger
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 17:09:47 +02:00
Nico Schottelius
b7824c3ead move explorer out dir creation into Explorer class
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 17:05:35 +02:00
Nico Schottelius
d95d195b40 have object seave its explorer outputs
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:59:43 +02:00
Nico Schottelius
f0852209f0 save debug in context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:59:22 +02:00
Steven Armstrong
823197cfb5 Merge remote-tracking branch 'telmich/master' 2011-10-11 16:57:10 +02:00
Steven Armstrong
dc9092dbef --os.environ
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:56:59 +02:00
Nico Schottelius
794a11d866 %s/\(self.\)\([a-z]*_path\)/\1context.\2/g
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:56:05 +02:00
Nico Schottelius
588731661e use context in explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:49:50 +02:00
Nico Schottelius
ba43212681 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-11 16:46:01 +02:00
Nico Schottelius
73f1190d55 cleanup context internally
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:45:45 +02:00
Nico Schottelius
dbd31252a8 remove CODE_HEADER
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:45:36 +02:00
Steven Armstrong
8543f3ed58 rename to match others
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:41:44 +02:00
Steven Armstrong
1c73fb1288 -- unused imports
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:41:01 +02:00
Steven Armstrong
b3c0a5912f Merge remote-tracking branch 'telmich/master' 2011-10-11 16:32:11 +02:00
Steven Armstrong
8ef0c18da0 update test suite to match new code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:31:43 +02:00
Steven Armstrong
a692e551c0 use new logger
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:31:05 +02:00
Nico Schottelius
d690fb30cb add base path and exec path to test main
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:26:33 +02:00
Nico Schottelius
dc21405583 use target host as key for logger
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:26:01 +02:00
Nico Schottelius
b8a3cf2f49 remove manifest code from config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:25:48 +02:00
Nico Schottelius
c28fd5bbfd add template for manifest for sar / steven to have fun
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:22:44 +02:00
Nico Schottelius
4c29d9839b configure logger based on hostname
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:19:27 +02:00
Steven Armstrong
6cbcd1132e Merge remote-tracking branch 'telmich/master' 2011-10-11 16:06:34 +02:00
Steven Armstrong
e437cd90d6 rewrite exec
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:06:21 +02:00
Nico Schottelius
d4f6328eef finish context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:05:32 +02:00
Nico Schottelius
0397e77a3e cleanup context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:04:09 +02:00
Nico Schottelius
5bd23d0605 template for context (REDO)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:59:26 +02:00
Steven Armstrong
4e00e2573e Merge remote-tracking branch 'telmich/master' 2011-10-11 15:54:42 +02:00
Nico Schottelius
8a327b6bc7 cleanup explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:50:50 +02:00
Nico Schottelius
d9d9e6bff6 move back transfer stuff to exec
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:47:32 +02:00
Steven Armstrong
d03f23129b test and fixtures for Object explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 15:45:10 +02:00
Steven Armstrong
2c6c9bcab5 Object handles its explorers itself
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 15:44:31 +02:00
Nico Schottelius
5393471841 add template for new explorer type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:25:29 +02:00
Steven Armstrong
45ff8f727f tests for Object source as list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:22:29 +02:00
Steven Armstrong
d7adff4e21 silently ignore error when deleting nonexistent file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:21:47 +02:00
Steven Armstrong
19ad2fe4a9 Merge remote-tracking branch 'telmich/master' 2011-10-11 14:10:04 +02:00
Steven Armstrong
442ffb75fa nuke legacy files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:09:47 +02:00
Nico Schottelius
cfb74897c4 write down (almost?) all tests for config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 13:47:41 +02:00
Nico Schottelius
2c5b064b00 ++todo = remove CODE_HEADER in generated code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 13:06:29 +02:00
Nico Schottelius
5443db97c4 always setup __debug if debug is set
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 12:54:55 +02:00
Steven Armstrong
405ebbccb7 Merge remote-tracking branch 'telmich/master'
Conflicts:
	lib/cdist/emulator.py
2011-10-11 12:40:44 +02:00
Steven Armstrong
bcde8683af rewrite emulator to use Type and Object classes
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 12:27:08 +02:00
Nico Schottelius
e72ad1f7cb emulator not needed in config_install anymore
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 12:19:13 +02:00
Steven Armstrong
753936b7c3 make object.source a list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:30:30 +02:00
Steven Armstrong
904396f6a5 new method to create object on the file system
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:29:06 +02:00
Steven Armstrong
5a082058e5 new method which checks if object exists on the file system
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:28:41 +02:00
Steven Armstrong
96c059983a - legacy code, + docstrings
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:28:10 +02:00
Steven Armstrong
af83c7af8e tests for Object source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:38:31 +02:00
Steven Armstrong
005009ab5d finish FileStringProperty
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:38:03 +02:00
Steven Armstrong
a1e1c8d665 +docstring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:02:01 +02:00
Nico Schottelius
72a2543470 introduce install support in emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:42:03 +02:00
Nico Schottelius
94cca2e537 prepend hostname in emulator as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:28:53 +02:00
Nico Schottelius
9647933a40 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-11 00:19:01 +02:00
Nico Schottelius
92d3925b1c add filter to prepend hostname in config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:18:32 +02:00
Nico Schottelius
35bfa2fcdc finish merge of context and config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-10 18:50:06 +02:00
Steven Armstrong
67543146f0 add source property
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 17:46:25 +02:00
Steven Armstrong
af8f006fc6 /type/cdist_type/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 16:50:56 +02:00
Steven Armstrong
bbcecc03ef remove redundant code, use new fsproperty module instead
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 16:39:48 +02:00
Steven Armstrong
915ec6d9ad rename property module to fsproperty
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 16:37:56 +02:00
Nico Schottelius
a8fc867834 ++test integration
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-10 15:43:36 +02:00
Nico Schottelius
c81a2925b8 accept exec_path, setup__target_host
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-10 15:38:38 +02:00
Steven Armstrong
0963237321 new package cdist.util
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 14:54:50 +02:00
Steven Armstrong
4a3bc72846 move file based properties out of core
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 14:54:35 +02:00
Steven Armstrong
f3932bb662 move file based properties out of core
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 14:54:26 +02:00
Steven Armstrong
44a722042a new class for using filesystem as backend for boolean properties
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 14:37:33 +02:00
Nico Schottelius
7823d0c997 merge context back into config (it is in fact the same idea)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-10 11:31:37 +02:00
Steven Armstrong
6de7bd3377 test for Object ran
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 10:06:41 +02:00
Steven Armstrong
7855a485b6 test for Object prepared
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 10:05:46 +02:00
Steven Armstrong
f2701cb512 test for Object changed
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 10:04:36 +02:00
Steven Armstrong
86f976976e bugfix: use absolute path when accessing file system
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 10:01:28 +02:00
Steven Armstrong
b1efc27b39 test for Object requirements
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 10:00:42 +02:00
Steven Armstrong
0ba6d55191 raise exception when given a relative path
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:57:56 +02:00
Steven Armstrong
96ca5b6988 bugfix: use absolute path to when accessing file sytem (unittest discoverd :-)
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:48:19 +02:00
Steven Armstrong
abf318ae90 test and fixtures for Object parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:47:06 +02:00
Steven Armstrong
88a1e34f30 test for Object object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:44:29 +02:00
Steven Armstrong
8384176080 test Object explorer_path
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:36:48 +02:00
Steven Armstrong
f3b942e591 test for Object paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:34:16 +02:00
Steven Armstrong
7c12027311 test and fixtures for Object class/static methods
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:30:28 +02:00
Steven Armstrong
e27cd9e809 when comparing objects, define equality as 'attributes are the same'
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 09:23:27 +02:00
Steven Armstrong
0f413f8e4d Merge remote-tracking branch 'telmich/master' 2011-10-10 08:58:31 +02:00
Nico Schottelius
790deb4645 in theory finish the install command
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-09 12:49:57 +02:00
Steven Armstrong
c9159b15f1 use package, no need for another file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-09 07:41:53 +02:00
Nico Schottelius
56e1fc9eb8 type explorer should run with remote base as well :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-08 12:01:53 +02:00
Nico Schottelius
ea146c88e7 cleanup config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-08 11:59:26 +02:00
Nico Schottelius
e10ebeadf8 BUGFIX: export global explorer with path from remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-08 03:24:05 +02:00
Steven Armstrong
f46344effe test and fixtures for Type.list_*
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 22:51:06 +02:00
Steven Armstrong
5d59102018 test only one instance of same type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 22:50:11 +02:00
Steven Armstrong
73bdb7f11f test and fixtures for Type members (name, path, ...)
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 22:49:09 +02:00
Steven Armstrong
d3e1276965 remove duplicate code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 22:39:45 +02:00
Steven Armstrong
8d3cad1815 test and fixtures for Type.{required,optional}_parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 22:32:55 +02:00
Steven Armstrong
0f9d71423a Merge remote-tracking branch 'telmich/master' 2011-10-07 18:48:18 +02:00
Steven Armstrong
b7c88b03d3 removed unused code/imports
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 18:29:24 +02:00
Steven Armstrong
8e0501aaa9 tests and fixtures for Type.explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 18:28:22 +02:00
Steven Armstrong
52f9388f07 tests and fixtures for Type.is_install
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 18:22:38 +02:00
Nico Schottelius
1cb86cb66b Merge branch 'master' of git://github.com/asteven/cdist 2011-10-07 18:18:21 +02:00
Nico Schottelius
71ed728b4a move parallel code to main binary, allow branching out on install and config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 18:14:17 +02:00
Nico Schottelius
11a8379c75 +comment
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 18:13:58 +02:00
Nico Schottelius
d21126189c indent/cleanup
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 18:04:13 +02:00
Steven Armstrong
f515e20572 start unittests for Type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 17:52:38 +02:00
Steven Armstrong
129e47d0c1 Merge remote-tracking branch 'telmich/master' 2011-10-07 17:51:25 +02:00
Steven Armstrong
ae15779c81 -- DeprecationWarning: object.__new__() takes no parameters
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 17:50:53 +02:00
Nico Schottelius
e985c0d697 remove sys.exit from banner
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:38:50 +02:00
Nico Schottelius
cabb5b9ab0 100% test coverage for the banner (feels good, doesn't it?)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:38:10 +02:00
Nico Schottelius
be78955cc6 move banner into cdist module
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:18:39 +02:00
Nico Schottelius
63c9a91bca +whitespace save out only
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:12:06 +02:00
Nico Schottelius
d32aa37fba cleanup context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:07:31 +02:00
Nico Schottelius
073717e07e some more relative to absolute path changes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:07:10 +02:00
Nico Schottelius
b5c01f7354 update code to use new _path from object
and type

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:04:52 +02:00
Nico Schottelius
c6e8f163f5 use variable require, not __require for defining
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:03:38 +02:00
Nico Schottelius
4a1cf3dbf3 -typo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:02:24 +02:00
Nico Schottelius
35900ae66c make type explorer work
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 17:01:59 +02:00
Nico Schottelius
85873d2fd2 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-07 16:57:41 +02:00
Steven Armstrong
b778c9ff15 absolute path is based on relative path -> does not need another .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 16:59:52 +02:00
Nico Schottelius
d9bb8e3107 use cdist_type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:55:19 +02:00
Steven Armstrong
5f4a85f6ad also need .cdist in relative paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 16:49:18 +02:00
Nico Schottelius
317390e962 Merge remote-tracking branch 'steven/master' 2011-10-07 16:47:04 +02:00
Steven Armstrong
53737aad3a append .cdist to absolute paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 16:46:55 +02:00
Nico Schottelius
10c083894c Merge remote-tracking branch 'steven/master' 2011-10-07 16:45:00 +02:00
Nico Schottelius
e8c9b10227 also use path in emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:44:53 +02:00
Steven Armstrong
cde4d87ab7 Merge remote-tracking branch 'telmich/master' 2011-10-07 16:43:07 +02:00
Nico Schottelius
03226dc5aa more fixes for relative path address
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:36:05 +02:00
Nico Schottelius
fd2fa23564 fix typeexplorer transfer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:27:15 +02:00
Steven Armstrong
117c950965 Merge remote-tracking branch 'telmich/master' 2011-10-07 16:24:53 +02:00
Nico Schottelius
2c9beb9506 use list not method
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:23:33 +02:00
Nico Schottelius
95c5ecf789 Merge remote-tracking branch 'steven/master' 2011-10-07 16:21:08 +02:00
Nico Schottelius
ea402fc0c5 use new call to object lists in absolute path
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:18:38 +02:00
Nico Schottelius
a25ef7f0e8 fix emulator and cdist module
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:16:45 +02:00
Nico Schottelius
03f5e1b456 fix emulator and cdist module
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:15:48 +02:00
Nico Schottelius
149a605b16 use more path, move type -> cdist_type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:14:29 +02:00
Nico Schottelius
2aa0a316e6 use _path not _dir in emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 16:13:00 +02:00