← Back to branch summary

~ubuntu-branches/ubuntu/hardy/ruby1.8/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/151_super.patch

  • Committer: Bazaar Package Importer
  • Author(s): akira yamada
  • Date: 2007-03-13 22:11:58 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070313221158-h3oql37brlaf2go2
Tags: 1.8.6-1
http://bugs.debian.org/410018
* new upstream version, 1.8.6.
* libruby1.8 conflicts with libopenssl-ruby1.8 (< 1.8.6) (closes: #410018)
* changed packaging style to cdbs from dbs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/151_super.patch
1
 
--- ruby-1.8.5/eval.c:1.616.2.196       Wed Oct  4 17:35:18 2006
2
 
+++ ruby-1.8.5/eval.c   Wed Nov  1 01:10:22 2006
3
 
@@ -5925,14 +5925,21 @@
4
 
                        while (opt && argc) {
5
 
                            assign(recv, opt->nd_head, *argv, 1);
6
 
                            argv++; argc--;
7
 
+                           ++i;
8
 
                            opt = opt->nd_next;
9
 
                        }
10
 
                        if (opt) {
11
 
                            rb_eval(recv, opt);
12
 
+                           while (opt) {
13
 
+                               opt = opt->nd_next;
14
 
+                               ++i;
15
 
+                           }
16
 
                        }
17
 
+                   }
18
 
+                   if (!node->nd_rest) {
19
 
                        i = nopt;
20
 
                    }
21
 
-                   if (node->nd_rest) {
22
 
+                   else {
23
 
                        VALUE v;
24
 
                        
25
 
                        if (argc > 0) {