new exploit.rb syntax error in trunk?

[katterjohn at gmail.com (Kris Katterjohn)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/06/2009 01:27 PM, Tim Maletic wrote:
> Is this just me?
>
> $ ruby --version
> ruby 1.8.6 (2007-03-13 patchlevel 0) [i686-darwin9.6.0]
> $ svn update
> At revision 6940.
> $ ./msfconsole
> /opt/framework-trunk/lib/msf/core.rb:49:in `require':
> /opt/framework-trunk/lib/msf/core/exploit.rb:255: syntax error,
> unexpected tLSHFT, expecting kEND (SyntaxError)
> <<<<<<< .mine
>   ^
> /opt/framework-trunk/lib/msf/core/exploit.rb:259: syntax error,
> unexpected tEQQ, expecting kEND
> =======
>    ^
> /opt/framework-trunk/lib/msf/core/exploit.rb:263: syntax error,
> unexpected tRSHFT, expecting kEND
> > > > > > > > .r6935
>   ^   from /opt/framework-trunk/lib/msf/core.rb:49
>       from /opt/framework-trunk/lib/msf/ui/console/driver.rb:1:in `require'
>       from /opt/framework-trunk/lib/msf/ui/console/driver.rb:1
>       from /opt/framework-trunk/lib/msf/ui/console.rb:10:in `require'
>       from /opt/framework-trunk/lib/msf/ui/console.rb:10
>       from /opt/framework-trunk/lib/msf/ui.rb:10:in `require'
>       from /opt/framework-trunk/lib/msf/ui.rb:10
>       from ./msfconsole:16:in `require'
>       from ./msfconsole:16

This typically happens because you had some local modifications to the file
before doing the update, then conflictions occurred.  I'm sure there's a
better/elegant way, but if this is the only file then I would just delete it
and update again.  It should replace the file and you're good to go.  Really
because you apparently didn't know of any modifications there (maybe you
applied some patch before?).

Cheers,
Kris Katterjohn

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQIcBAEBAgAGBQJKeySpAAoJEEQxgFs5kUfu2DEP/Ayc+ETbjs5jNqv13baylNB4
LQ8RORHPo91KXb8nDv4o2TEkfhagB0P6wlguS/qXMly0w1js4/0PLQtfkAW4cq7A
eM587JSs9lsadEwJWV0KS5KBafGtI9bV92/FYCXWrLnaeoolSZH6wDVnJl/yKPQQ
aVlN4Z/IBVli6gh6Hl9gDDyuu2MfpCqJ13ERiPjbbZQd8mK8wNUGwATxyCt5kf4C
AJHMUJmJkw5p6feLKQ3eSdcyDrymj/cRFGEKJLS7JDBOg926ejmQdNJYQLBYF51C
XNIX4eJ/pGiNM2miWZArn8+sK28xhgvICWE3ayvowFHXoszhqZVAPkz3kHIw+abt
+/2x0s40W3kXPV62MdK45joZz5jCQ4rApq2ND/esICuMTAhTmaxlp6d3IXOIlNFv
ixsVekWb1bgGIg6oQD/0ZHld6L9mdaR4BLz4NIspD0rHVw+vR4NBAvU7gcKkwaW/
79BESa/r7VtpwLLbFEeoxfbedewyrc7ebZjusW7vVjcKAeFxYXSUn2DAtlIjIbho
Mphbc8NgG4SCyFlURWiGAoaXO6KI+qANm2n+U32SLRUAohncgTe6Q5DeYFtVktDh
kIrQDt9dBy063ShshFybalpaJlFQToeiN7haW8dthKYupHhNnWuJk1lICDlQr72Q
olHjJ4UMfg9OJDax+Foq
=hIT5
-----END PGP SIGNATURE-----