~james-page/ubuntu/natty/cobbler/fix-764391

« back to all changes in this revision

Viewing changes to cobbler/remote.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short, Andres Rodriguez
  • Date: 2011-03-11 07:59:55 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110311075955-9z16j4suh6xwcwh8
Tags: 2.1.0~bzr2005-0ubuntu1
[Chuck Short]
* New upstream release 

[Andres Rodriguez]
* Add python-koan package (LP: #731616):
  - debian/control: Add python-koan binary package; fix typo
  - debian/python-cobbler.install: Do not install koan python modules.
  - debian/python-koan.install: Add. Install koan python modules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
92
92
        try:
93
93
            rc = self._run(self)
94
94
            self.remote._set_task_state(self,self.event_id,EVENT_COMPLETE)
95
 
            self.on_done(self)
 
95
            self.on_done()
96
96
            return rc
97
97
        except:
98
98
            utils.log_exc(self.logger)
235
235
            only = options.get("only", None)
236
236
            if only is not None:
237
237
                repos = [ only ] 
 
238
            nofail = options.get("nofail", len(repos) > 0)
238
239
 
239
240
            if len(repos) > 0:
240
241
                for name in repos:
241
242
                    self.remote.api.reposync(tries=self.options.get("tries",
242
 
                        3), name=name, nofail=True, logger=self.logger)
 
243
                        3), name=name, nofail=nofail, logger=self.logger)
243
244
            else:
244
245
                self.remote.api.reposync(tries=self.options.get("tries",3),
245
 
                        name=None, nofail=False, logger=self.logger)
 
246
                        name=None, nofail=nofail, logger=self.logger)
246
247
            return True
247
248
        return self.__start_task(runner, token, "reposync", "Reposync", options)
248
249
 
328
329
        logatron = clogger.Logger("/var/log/cobbler/tasks/%s.log" % event_id)
329
330
 
330
331
        thr_obj = CobblerThread(event_id,self,logatron,args)
 
332
        on_done_type = type(thr_obj.on_done)
 
333
 
331
334
        thr_obj._run = thr_obj_fn
332
335
        if on_done is not None:
333
 
           thr_obj.on_done = on_done
 
336
           thr_obj.on_done = on_done_type(on_done, thr_obj, CobblerThread)
334
337
        thr_obj.start()
335
338
        return event_id
336
339
 
1266
1269
 
1267
1270
        self._log("run_install_triggers",token=token)
1268
1271
 
1269
 
        if mode != "pre" and mode != "post":
 
1272
        if mode != "pre" and mode != "post" and mode != "firstboot":
1270
1273
            return False
1271
1274
        if objtype != "system" and objtype !="profile":
1272
1275
            return False