From 149ba6535d8146f9bf3ea3a6bd90bdd800139edf Mon Sep 17 00:00:00 2001
From: Etienne Pallier <epallier@irap.omp.eu>
Date: Fri, 22 Mar 2019 18:16:40 +0100
Subject: [PATCH] bugfix les chevrons...

---
 README.md          |  2 +-
 src/agent/Agent.py | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 4b74516..ef227f9 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Date: 22/03/2019
 
 Author: E. Pallier
 
-VERSION: 0.20.29
+VERSION: 0.20.30
 
 Comment: mode "test" (-t) géré (= mode simulateur)
 		
diff --git a/src/agent/Agent.py b/src/agent/Agent.py
index 1e29ef4..a26fa0e 100755
--- a/src/agent/Agent.py
+++ b/src/agent/Agent.py
@@ -78,10 +78,6 @@ from threading import Thread
 import threading, multiprocessing
 import time
 import utils.Logger as L
-<<<<<<< HEAD
-import random
-=======
->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce
 import socket
 #import ctypes
 #import copy
@@ -337,13 +333,8 @@ class Agent:
     _computer_description = ''
     _path_data = '../../config'
 
-<<<<<<< HEAD
-    _iter_num = 1
-=======
     _iter_num = None
 
->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce
-
     def __init__(self, name:str="Agent", config_filename:str=None, RUN_IN_THREAD=True):
         self.name = name
         self.SIMULATOR_COMMANDS = iter(self.SIMULATOR_COMMANDS_LIST)
@@ -708,11 +699,7 @@ class Agent:
         TODO:
         only si date fichier xml changée => en RAM, un objet Config avec méthodes d'accès, appelle le parser de AK (classe Config.py indépendante)
         """
-<<<<<<< HEAD
-        print("Loading the config file...")
-=======
         self.printd("Loading the config file...")
->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce
         self.config.load()
         if self.config.get_last_errno() != self.config.NO_ERROR:
             raise Exception(f"error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
@@ -730,11 +717,7 @@ class Agent:
             if param['section']=="assembly" and param['key']=="alias":
                 assembled_aliases.append(param['value'])
         #print(f"Unit {unit_alias} is the assembly of {assembled_aliases}")
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce
         print("--------- Components of the unit -----------")
         print("Configuration file is {}".format(self.config.get_configfile()))            
         alias = self.config.get_aliases('unit')[0]
@@ -752,17 +735,6 @@ class Agent:
                         assembled_mount_aliases.append(alias)
                     elif unit_subtag=="channel":
                         assembled_channel_aliases.append(alias)
-<<<<<<< HEAD
-                        
-        print("--------- Assembly of the unit -----------")
-        print(f"Assembled mount aliases: {assembled_mount_aliases}")
-        print(f"Assembled channel aliases: {assembled_channel_aliases}")
-        
-        # --- Get the home of the mount[0]
-        mount_alias = assembled_mount_aliases[0]
-        home = self.config.get_param(mount_alias,'MountPointing','home')
-            
-=======
 
         print("--------- Assembly of the unit -----------")
         print(f"Assembled mount aliases: {assembled_mount_aliases}")
@@ -772,7 +744,6 @@ class Agent:
         mount_alias = assembled_mount_aliases[0]
         home = self.config.get_param(mount_alias,'MountPointing','home')
 
->>>>>>> 1d32122be4d1f56e208e7497498671de131dc8ce
         print("------------------------------------------")
         hostname = socket.gethostname()
         self._computer_alias = ''
--
libgit2 0.21.2