[robotframework] 2 new revisions pushed by pekka.klarck on 2011-09-28 20:39 GMT

[robotframework]

2 new revisions:

Revision: 914a150e5728
Author:   Pekka Klärck
Date:     Wed Sep 28 13:38:28 2011
Log:      dos2unix
http://code.google.com/p/robotframework/source/detail?r=914a150e5728
Revision: abae46b913cb
Author:   Pekka Klärck
Date:     Wed Sep 28 13:39:38 2011
Log:      Oops. No wonder build was broken.
http://code.google.com/p/robotframework/source/detail?r=abae46b913cb

==============================================================================
Revision: 914a150e5728
Author:   Pekka Klärck
Date:     Wed Sep 28 13:38:28 2011
Log:      dos2unix
http://code.google.com/p/robotframework/source/detail?r=914a150e5728

Modified:
 /atest/robot/keywords/named_args/with_library_keywords.txt
 /atest/robot/standard_libraries/builtin/import_resource.txt
 /atest/testdata/standard_libraries/builtin/import_resource.txt
 /atest/testdata/standard_libraries/builtin/import_resource_resource_1.txt
 /atest/testdata/standard_libraries/builtin/import_resource_resource_2.txt
 /atest/testdata/standard_libraries/builtin/import_resource_resource_3.txt
  
/atest/testdata/standard_libraries/builtin/import_resource_resource_resource.txt
 /atest/testdata/standard_libraries/builtin/variables_to_import_1.py


==============================================================================
Revision: abae46b913cb
Author:   Pekka Klärck
Date:     Wed Sep 28 13:39:38 2011
Log:      Oops. No wonder build was broken.
http://code.google.com/p/robotframework/source/detail?r=abae46b913cb

Modified:
 /atest/testdata/standard_libraries/builtin/import_resource.txt

=======================================
--- /atest/testdata/standard_libraries/builtin/import_resource.txt	Wed Sep  
28 13:38:28 2011
+++ /atest/testdata/standard_libraries/builtin/import_resource.txt	Wed Sep  
28 13:39:38 2011
@@ -76,7 +76,7 @@
 Re-Import Resource And Verify Imports
     [Arguments]  ${num}  ${upper}=
     ${path} =  Set Variable  ${CURDIR}/import_resource_resource_${num}.txt
-    ${path} =  Evaluate  '${path.upper()}' if os.sep != '/' or '${upper}'  
== 'upper' else '${path}'  modules=os
+    ${path} =  Evaluate  '${path.upper()}' if os.sep != '/' and '${upper}'  
== 'upper' else '${path}'  modules=os
     Import Resource  ${path}
     Should Be Equal  ${COMMON VAR}  resource ${num}
     KW From Import Resource Resource