Revision c6868e1d lib/mcpu.py

b/lib/mcpu.py
97 97
                    interesting events are happening
98 98
    """
99 99
    self.cfg = None
100
    self.sstore = None
101 100
    self._feedback_fn = feedback
102 101

  
103 102
  def ExecOpCode(self, op):
......
115 114
    if lu_class is None:
116 115
      raise errors.OpCodeUnknown("Unknown opcode")
117 116

  
117
    if lu_class.REQ_WSSTORE:
118
      sstore = ssconf.WritableSimpleStore()
119
    else:
120
      sstore = ssconf.SimpleStore()
121

  
118 122
    if self.cfg is None:
119 123
      self.cfg = config.ConfigWriter()
120
      if lu_class.REQ_WSSTORE:
121
        self.sstore = ssconf.WritableSimpleStore()
122
      else:
123
        self.sstore = ssconf.SimpleStore()
124 124
    if self.cfg is not None:
125 125
      write_count = self.cfg.write_count
126 126
    else:
127 127
      write_count = 0
128
    lu = lu_class(self, op, self.cfg, self.sstore)
128
    lu = lu_class(self, op, self.cfg, sstore)
129 129
    lu.CheckPrereq()
130 130
    hm = HooksMaster(rpc.call_hooks_runner, self, lu)
131 131
    h_results = hm.RunPhase(constants.HOOKS_PHASE_PRE)
......
163 163
    if lu_class is None:
164 164
      raise errors.OpCodeUnknown("Unknown opcode")
165 165

  
166
    if lu_class.REQ_WSSTORE:
167
      sstore = ssconf.WritableSimpleStore()
168
    else:
169
      sstore = ssconf.SimpleStore()
170

  
166 171
    if self.cfg is None:
167 172
      self.cfg = config.ConfigWriter()
168
      self.sstore = ssconf.SimpleStore()
169 173
    #do_hooks = lu_class.HPATH is not None
170
    lu = lu_class(self, op, self.cfg, self.sstore)
174
    lu = lu_class(self, op, self.cfg, sstore)
171 175
    lu.CheckPrereq()
172 176
    #if do_hooks:
173 177
    #  hm = HooksMaster(rpc.call_hooks_runner, self, lu)

Also available in: Unified diff