[Python-checkins] distutils2: merged

[tarek.ziade]

tarek.ziade pushed 34210b95cffd to distutils2:

http://hg.python.org/distutils2/rev/34210b95cffd
changeset:   919:34210b95cffd
tag:         tip
parent:      917:608317e1a8b4
parent:      918:f1cdc803cdd5
user:        Tarek Ziade <tarek at ziade.org>
date:        Sat Jan 29 15:19:39 2011 +0100
summary:
  merged

files:
  patch

diff --git a/patch b/patch
deleted file mode 100644
--- a/patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -r 5603e1bc5442 distutils2/util.py
---- a/distutils2/util.py    Fri Jan 28 18:42:44 2011 +0100
-+++ b/distutils2/util.py    Sat Jan 29 02:39:55 2011 +0100
-@@ -1203,12 +1203,13 @@
-         in_cfg_value = has_get_option(config, section, option)
-         if not in_cfg_value:
-             # There is no such option in the setup.cfg
--            continue
--
--        if arg == "long_description":
--            filename = has_get_option("description_file")
--            if filename:
--                in_cfg_value = open(filename).read()
-+            if arg == "long_description":
-+                filename = has_get_option(config, section, "description_file")
-+                print "We have a filename", filename
-+                if filename:
-+                    in_cfg_value = open(filename).read()
-+            else:
-+                continue
- 
-         if arg in MULTI_FIELDS:
-             # Special behaviour when we have a multi line option

--
Repository URL: http://hg.python.org/distutils2