diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-30 13:08:38 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-30 13:08:38 +0200 |
| commit | d5c37fe74409401dd6cf1b0a37a789083a0cc413 (patch) | |
| tree | a390f92b316001999a68cf21bfa7bb79d845dd2a /DistUpgrade | |
| parent | 87f090e29db13e7bf27d0c23d4cc672389fa5f59 (diff) | |
| download | python-apt-d5c37fe74409401dd6cf1b0a37a789083a0cc413.tar.gz | |
* as suggested by mdz use a wrapper script instead of
re-exec
Diffstat (limited to 'DistUpgrade')
| -rwxr-xr-x | DistUpgrade/dapper | 3 | ||||
| -rwxr-xr-x | DistUpgrade/dist-upgrade.py | 15 |
2 files changed, 3 insertions, 15 deletions
diff --git a/DistUpgrade/dapper b/DistUpgrade/dapper new file mode 100755 index 00000000..bf383e9f --- /dev/null +++ b/DistUpgrade/dapper @@ -0,0 +1,3 @@ +#!/bin/sh + +catchsegv ./dist-upgrade.py 2>&1 > /var/log/dist-upgrade-segv.log diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index 6b388532..632de54d 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -4,30 +4,15 @@ from DistUpgradeControler import DistUpgradeControler from DistUpgradeConfigParser import DistUpgradeConfig import logging import os -import os.path import sys if __name__ == "__main__": - # init logging logging.basicConfig(level=logging.DEBUG, filename="/var/log/dist-upgrade.log", format='%(asctime)s %(levelname)s %(message)s', filemode='w') - # make sure we run under a segv-handler - if not os.environ.has_key("LD_PRELOAD") or \ - not "libSegFault" in os.environ["LD_PRELOAD"]: - fd = os.open("/var/log/dist-upgrade-segv.log", - os.O_RDWR|os.O_CREAT|os.O_TRUNC) - os.dup2(fd,1) - os.dup2(fd,2) - # restart ourself - os.execl("/usr/bin/catchsegv", "catchsegv", sys.argv[0]) - else: - logging.debug("Runing with segv-handler: %s", os.environ["LD_PRELOAD"]) - - # init config and get a view config = DistUpgradeConfig() requested_view= config.get("View","View") try: |
