Merge pull request #91 from ajdecon/logical-or

Change "||" to "or" to avoid syntax error
ganglia · Oct 2, 2012 · 4352af0 · 4352af0
2 parents 280e538 + 3807375
commit 4352af0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gpu/nvidia/python_modules/nvidia.py b/gpu/nvidia/python_modules/nvidia.py
@@ -99,7 +99,7 @@ def gpu_device_handler(name):
         except NVMLError, nvmlError:
             if NVML_ERROR_NOT_SUPPORTED == nvmlError.value:
                 return 'N/A'
-    elif (metric == 'perf_state' || metric == 'performance_state'):
+    elif (metric == 'perf_state' or metric == 'performance_state'):
         state = nvmlDeviceGetPerformanceState(gpu_device)
         try:
             int(state)