-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Eddy Petrișor wrote:
>
> Now, this is helpful:
>
> http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/8975
>
> It seems that the functions fu_* are even private and upstream has
> removed the dependency on these functions:
>
> http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/8987
Ok, I digged even a little bit more and I found that upstream
released 0.7.2 meanwhile.
I backported what I thought it should fix the thing (note that I am
ABSOLUTELY foreign to ruby), and the package build.
Patch is attached. Not sure if i counts, but sure it was fun for me
:-) .
- --
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFF/xTCY8Chqv3NRNoRAsmeAJ0bGpxKBNvugxDe+FEHPuqUG+4zxQCfRaLW
9tUX+un0u5GZgExcnyxXOf8=
=y7e5
-----END PGP SIGNATURE-----
diff -ruN rake-0.7.1/debian/changelog rake-0.7.1.fixed/debian/changelog
--- rake-0.7.1/debian/changelog 2007-03-20 00:51:01.000000000 +0200
+++ rake-0.7.1.fixed/debian/changelog 2007-03-20 00:48:02.000000000 +0200
@@ -1,3 +1,10 @@
+rake (0.7.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * backport fixes from 0.7.2 for the FTBFS (Closes: #415425)
+
+ -- Eddy PetriÈor <[EMAIL PROTECTED]> Tue, 20 Mar 2007 00:46:42 +0200
+
rake (0.7.1-1) unstable; urgency=low
* New upstream release
diff -ruN rake-0.7.1/lib/rake.rb rake-0.7.1.fixed/lib/rake.rb
--- rake-0.7.1/lib/rake.rb 2006-04-03 06:22:33.000000000 +0300
+++ rake-0.7.1.fixed/lib/rake.rb 2007-03-20 00:46:02.000000000 +0200
@@ -722,8 +722,8 @@
ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
}
end
- fu_check_options options, :noop, :verbose
- fu_output_message cmd.join(" ") if options[:verbose]
+ rake_check_options options, :noop, :verbose
+ rake_output_message cmd.join(" ") if options[:verbose]
unless options[:noop]
res = system(*cmd)
block.call(res, $?)
@@ -807,9 +807,9 @@
module_eval(<<-EOS, __FILE__, __LINE__ + 1)
def #{name}( *args, &block )
super(
- *fu_merge_option(args,
- #{default_options.join(', ')}
- ), &block)
+ *rake_merge_option(args,
+ #{default_options.join(', ')}
+ ), &block)
end
EOS
end
@@ -881,7 +881,7 @@
end
# Merge the given options with the default values.
- def fu_merge_option(args, defaults)
+ def rake_merge_option(args, defaults)
if Hash === args.last
defaults.update(args.last)
args.pop
@@ -889,10 +889,26 @@
args.push defaults
args
end
- private :fu_merge_option
+ private :rake_merge_option
+ # Send the message to the default rake output (which is $stderr).
+ def rake_output_message(message)
+ $stderr.puts(message)
+ end
+ private :rake_output_message
+
+ # Check that the options do not contain options not listed in
+ # +optdecl+. An ArgumentError exception is thrown if non-declared
+ # options are found.
+ def rake_check_options(options, *optdecl)
+ h = options.dup
+ optdecl.each do |name|
+ h.delete name
+ end
+ raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+ end
+ private :rake_check_options
extend self
-
end
######################################################################
