diff --git a/README.md b/README.md index 6a59b99..6307e3b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ sudo chmod 754 /usr/local/bin/tm sudo mkdir /usr/local/tm sudo chmod 775 /usr/local/tm ``` + In Ubuntu 18.04 ``` sudo cp tm-cleanup.* /lib/systemd/system/ diff --git a/tm.py b/tm.py index dd42ad2..f7f4ba8 100755 --- a/tm.py +++ b/tm.py @@ -108,8 +108,8 @@ def reservation(self, argv): try: dt = datetime.strptime(args.expire, dtfmt) except(ValueError): - self.log('expiration date format must be {}, not ', - args.expire, dtfmt) + self.log('expiration date format must be dd/mm/yy' + ', not {}'.format(args.expire)) return if dt < datetime.now(): self.log('date must be on or later than today') @@ -121,9 +121,7 @@ def reservation(self, argv): self.log('14 days of the maximum reservation is set') if args.func == 'reserve': - if self.set_loader(r['mac'], self.user, args.node): - self.log('{}: reservation successful'.format(args.node)) - else: + if not self.set_loader(r['mac'], self.user, args.node): self.log('{}: failed to create symlink'.format(args.node)) return @@ -396,7 +394,7 @@ def set_loader(self, mac, d, node): def reset_node(self, node, mac): if not self.set_loader(mac, 'base', node): - print('{}: cannot restore symlink for {}'.format(node, mac)) + self.log('{}: cannot restore symlink for {}'.format(node, mac)) for e in ['user', 'expire']: self.db.update(delete(e), Query().node == node)