This is an automated email from the ASF dual-hosted git repository.

gabriel pushed a commit to branch python3-vr
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 6b2330bbda0c61478c66b3c08c07d62f9ffdd831
Author: Gabriel Brascher <gabr...@apache.org>
AuthorDate: Thu Sep 24 06:09:53 2020 -0300

    Fix conflict with master
    
    Also: port cloud-grab-dependent-library-versions to python3
---
 python/bindir/cloud-grab-dependent-library-versions | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/bindir/cloud-grab-dependent-library-versions 
b/python/bindir/cloud-grab-dependent-library-versions
index cdb5053..ca6d4a9 100755
--- a/python/bindir/cloud-grab-dependent-library-versions
+++ b/python/bindir/cloud-grab-dependent-library-versions
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ def getDependentLibraryInfo():
                 start = True
                 continue
             if not start: continue
-            
+
             (key, value) = l.split(':', 2)
             key = key.strip()
             value = value.strip()
@@ -70,7 +70,7 @@ def arrangeOutPut(libraryMap):
             entry = "%-40s:    %s"%(l, 'UNKNOWN')
         msg.append(entry)
     print('\n'.join(msg))
-        
+
 if __name__ == '__main__':
     pythonDepLibraries = ['python', 'python3']
     relver = runCmd(['rpm', '-q', 'centos-release'])

Reply via email to