[IMP] Improved environment information message
authorNCH <>
Wed, 8 Jul 2009 11:12:32 +0000 (16:42 +0530)
committerhusen daudi <hda@hda>
Wed, 8 Jul 2009 11:12:32 +0000 (16:42 +0530)
bzr revid: hda@hda-20090708111232-9jgxvv1id35t9q26

1  2 
bin/service/web_services.py

@@@ -505,27 -505,29 +505,31 @@@ GNU Public Licence
              l.notifyChannel('migration', netsvc.LOG_ERROR, tb_s)
              raise
  
-     def get_server_environment(self,lang=False):
+     def get_server_environment(self):
          try:
-             if '.bzr' in os.listdir((os.getcwd()[0:-3])):
-                 fp = open(os.path.join(os.getcwd()[0:-3],'.bzr/branch/last-revision'))
-                 rev_no = fp.read()
-                 fp.close()
-             else:
-                 rev_no = 'Bazaar Not Installed !'
-         except:
-             rev_no = 'Bazaar Not Installed !'
-         if not lang:
-             lang = os.environ.get('LANG', '').split('.')[0]
-         environment = 'Environment_Information : \n' \
-                       'Operating System : %s\n' \
+             revno = os.popen('bzr revno').read()
+             rev_log = ''
+             cnt = 0
+             for line in os.popen('bzr log -r %s'%(int(revno))).readlines():
+                 if line.find(':')!=-1:
+                     if not cnt == 4:
+                         rev_log += '\t' + line  
+                         cnt += 1
++                    else:
++                        break
+         except Exception,e:
+              rev_log = 'Exception: %s\n' % (str(e))
+         os_lang = os.environ.get('LANG', '').split('.')[0]
+         environment = '\nEnvironment_Information : \n' \
                        'PlatForm : %s\n' \
+                       'Operating System : %s\n' \
                        'Operating System Version : %s\n' \
+                       'Operating System Locale : %s\n'\
                        'Python Version : %s\n'\
-                       'Locale : %s\n' \
                        'OpenERP-Server Version : %s\n'\
-                       'OpenERP-Server Last Revision ID : %s' \
-                       %(os.name,sys.platform,str(sys.version.split('\n')[1]),str(sys.version[0:5]), lang, release.version,rev_no)
+                       'Last revision Details: \n%s' \
+                       %(sys.platform,os.name,str(sys.version.split('\n')[1]),os_lang,str(sys.version[0:5]),release.version,rev_log)
          return environment
  common()