← Back to branch summary

~ubuntu-branches/ubuntu/karmic/python2.6/karmic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/bdist-wininst-notfound.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2009-04-14 08:09:24 UTC
  • Revision ID: james.westby@ubuntu.com-20090414080924-ajkc33w750r2jpk3
Tags: 2.6.2~rc1-0ubuntu2
* Update to 20090414, taken from the 2.6 release branch.
  - No numbered table of contents for the docs, not in sphinx-0.5.
  - Fix issues #5731, #5741.
* Revert the change to interpret an unexpanded prefix in get_python_lib().
* Fix build failure on ia64.
* Move the bdist_wininst files into the -dev package (only needed to build
  windows installers).
* Document changes to the site directory name in the installation manual.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bdist-wininst-notfound.dpatch
 
1
#! /bin/sh -e
 
2
 
 
3
# DP: suggest installation of the pythonX.Y-dev package, if bdist_wininst
 
4
# DP: cannot find the wininst-* files.
 
5
 
 
6
dir=
 
7
if [ $# -eq 3 -a "$2" = '-d' ]; then
 
8
    pdir="-d $3"
 
9
    dir="$3/"
 
10
elif [ $# -ne 1 ]; then
 
11
    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
 
12
    exit 1
 
13
fi
 
14
case "$1" in
 
15
    -patch)
 
16
        patch $pdir -f --no-backup-if-mismatch -p0 < $0
 
17
        ;;
 
18
    -unpatch)
 
19
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
 
20
        ;;
 
21
    *)
 
22
        echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
 
23
        exit 1
 
24
esac
 
25
exit 0
 
26
 
 
27
--- Lib/distutils/command/bdist_wininst.py.orig 2009-04-10 13:44:21.000000000 +0200
 
28
+++ Lib/distutils/command/bdist_wininst.py      2009-04-10 13:44:50.000000000 +0200
 
29
@@ -354,5 +354,8 @@
 
30
             sfix = ''
 
31
 
 
32
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
 
33
-        return open(filename, "rb").read()
 
34
+        try:
 
35
+            return open(filename, "rb").read()
 
36
+        except IOError, msg:
 
37
+            raise DistutilsFileError, str(msg) + ', please install the python%s-dev package' % sys.version[:3]
 
38
 # class bdist_wininst