Merge lp:~barry/ubuntu/natty/mgltools-viewerframework/bug-685476 into lp:ubuntu/natty/mgltools-viewerframework

Proposed by Barry Warsaw
Status: Merged
Merged at revision: 11
Proposed branch: lp:~barry/ubuntu/natty/mgltools-viewerframework/bug-685476
Merge into: lp:ubuntu/natty/mgltools-viewerframework
Diff against target: 44 lines (+10/-3)
3 files modified
ViewerFramework/VF.py (+0/-2)
debian/changelog (+8/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~barry/ubuntu/natty/mgltools-viewerframework/bug-685476
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Ubuntu branches Pending
Review via email: mp+46995@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Thanks for working on this. It seems that revision 12 is empty. Was there supposed to be something in there?

Revision history for this message
Barry Warsaw (barry) wrote :

Actually, no ;). It's an empty commit just to link the branch to the bug (essentially equivalent to 'bzr commit --unchanged --fixes=lp:123456'). Happens if I forget to --fixes on the last substantive commit before I push.

Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work there, shouldn't you use a patch system rather than changing the source directly? could you also add the patch to the debian bug? the debian bug mention it could be a python issue, what's up with that?

Revision history for this message
Sebastien Bacher (seb128) wrote :

Setting to "Work In Progress" so it doesn't show on the sponsoring list, set it back to "Needs Review" when you reply to the questions but it would be nice to stay on sync with Debian with this one, we should at least give them a ping with the patch in the bts bug

Revision history for this message
Barry Warsaw (barry) wrote :

% what-patch
patchless?

So I've been told it's bad form to add a patch system when there isn't one already, and to just patch the source directly. I'm not sure the commented out inclusion of simple-patchsys.mk counts as "having a patch system already".

I'll be happy to add the patch to the bts, and I'm happy to let the Debian maintainer decide exactly how to make the change there (and we'll pick that up on the next sync).

I was involved in the upstream issue; it's a deliberate change in semantics for Python 2.7. Assignment to __debug__ was always considered illegal, but through accident it was allowed in < 2.7 when __debug__ was used as an attribute. In 2.7, that bug was fixed.

Revision history for this message
Micah Gersten (micahg) wrote :

I just have to do a test build before uploading, but tentatively approved. Thanks! BTW, you can just uncommit and use debcommit which does --fixes automatically for you.

review: Approve
Revision history for this message
Micah Gersten (micahg) wrote :

By the way, please send the patch to Debian as you suggested. You can use the submittodebian tool in ubuntu-dev-tools or the guidelines here for tagging: https://wiki.ubuntu.com/Debian/Usertagging
Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ViewerFramework/VF.py'
2--- ViewerFramework/VF.py 2010-09-12 00:20:31 +0000
3+++ ViewerFramework/VF.py 2011-01-20 23:31:08 +0000
4@@ -257,10 +257,8 @@
5
6 self.hasGui = gui
7
8- global __debug__
9 self.withShell = withShell
10 self.trapExceptions = trapExceptions
11- self.__debug__ = 0
12 # create a socket communication object
13 try:
14 self.socketComm = Comm()
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2010-09-12 00:20:31 +0000
18+++ debian/changelog 2011-01-20 23:31:08 +0000
19@@ -1,3 +1,11 @@
20+mgltools-viewerframework (1.5.4.cvs.20100912-1ubuntu1) natty; urgency=low
21+
22+ * Assignment to __debug__, even as an attribute, is not allowed in
23+ Python 2.7. See upstream tracker issue
24+ <http://bugs.python.org/issue9438>. (LP: #685476)
25+
26+ -- Barry Warsaw <barry@ubuntu.com> Thu, 20 Jan 2011 17:17:51 -0500
27+
28 mgltools-viewerframework (1.5.4.cvs.20100912-1) unstable; urgency=low
29
30 * New upstream version.
31
32=== modified file 'debian/control'
33--- debian/control 2010-09-12 00:20:31 +0000
34+++ debian/control 2011-01-20 23:31:08 +0000
35@@ -1,7 +1,8 @@
36 Source: mgltools-viewerframework
37 Section: non-free/science
38 Priority: optional
39-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
40+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
41+XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
42 DM-Upload-Allowed: yes
43 XS-Autobuild: yes
44 Uploaders: Steffen Moeller <moeller@debian.org>, Sargis Dallakyan <sargis@scripps.edu>

Subscribers

People subscribed via source and target branches

to all changes: