← Back to branch summary

~ubuntu-core-dev/unattended-upgrades/ubuntu

« back to all changes in this revision

Viewing changes to unattended-upgrade-shutdown

  • Committer: Barry Warsaw
  • Date: 2012-06-19 20:19:36 UTC
  • mfrom: (277.1.5 unattended-upgrades)
  • mto: This revision was merged to the branch mainline in revision 288.
  • Revision ID: barry@python.org-20120619201936-vrpi8yxbbxzdr6qg
Merge Thomas's branch: Port to Python 3
- Additional fixes by Barry

Show diffs side-by-side

added added

removed removed

Lines of Context:
unattended-upgrade-shutdown
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python3
2
2
# Copyright (c) 2009 Canonical Ltd
3
3
#
4
4
# AUTHOR:
141
141
            os.kill(pid, signal.SIGUSR1)
142
142
        # show log
143
143
        log_progress()
144
 
        time.sleep(5)
145
 
        if (time.time() - start_time) > options.delay*60:
 
144
        time.sleep(5)
 
145
        if (time.time() - start_time) > options.delay*60:
146
146
            logging.warning(_("Giving up on lockfile after %s delay") % options.delay)
147
147
            sys.exit(1)
148
148