tailor 0.9.35-2 (ubuntu jaunty)

[Daniel Hahler]

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

Hello,

thank you for this bug report and a patch to fix/workaround this.

Can you please forward it to the tailor bug tracker?
http://progetti.arstecnica.it/tailor/

They can say if your fix is appropriate/correct and fix the root cause
otherwise.

If you cannot forward it yourself, please tell me/us, so we will do it.

You may also/additionally create a bug in Launchpad (for the bug in
Ubuntu; use "ubuntu-bug tailor") and then link the upstream bug report
from there, so everything can get tracked (the fix in Ubuntu and upstream).


Thank you,
Daniel

Völgyes Dávid wrote:
> Hi,
> 
> I use Ubuntu Jaunty 9.04 and tailor 0.9.35-2 application
> 
> I have found a bug and I think I have a solution.
> I tried to convert a monotone repository to svn repository.
> I got this:
> 
> 10:58:35 [C] Upstream change application failed
> 10:58:35 [C] Something unexpected!
> Traceback (most recent call last):
>   File "/var/lib/python-support/python2.6/vcpx/tailor.py", line 154, in __call__
>     self.update()
>   File "/var/lib/python-support/python2.6/vcpx/tailor.py", line 118, in update
>     applyable=self._applyable, applied=self._applied)
>   File "/var/lib/python-support/python2.6/vcpx/dualwd.py", line 102,
> in applyPendingChangesets
>     applied=applied)
>   File "/var/lib/python-support/python2.6/vcpx/source.py", line 113,
> in applyPendingChangesets
>     res = self._applyChangeset(c)
>   File "/var/lib/python-support/python2.6/vcpx/repository/monotone.py",
> line 818, in _applyChangeset
>     mtr.updateCset( changeset )
>   File "/var/lib/python-support/python2.6/vcpx/repository/monotone.py",
> line 689, in updateCset
>     self.diffparser.convertDiff(chset)
>   File "/var/lib/python-support/python2.6/vcpx/repository/monotone.py",
> line 540, in convertDiff
>     if chentry == None:
>   File "/var/lib/python-support/python2.6/vcpx/changes.py", line 65, in __eq__
>     return (self.name == other.name and
> AttributeError: 'NoneType' object has no attribute 'name'
> 
> As you can see: "other" is nonetype. You should check type of "other"
> in /var/lib/python-support/python2.6/vcpx/changes.py.
> I have made a patch. (diff: original ( changes.py ) and the fixed file
> ( /var/lib/python-support/python2.6/vcpx/changes.py ) ):
> 
> --- changes.py  2009-08-27 13:35:04.773749252 +0200
> +++ /var/lib/python-support/python2.6/vcpx/changes.py   2009-08-27
> 11:50:35.000000000 +0200
> @@ -5,6 +5,8 @@
>  # :Licenza:  GNU General Public License
>  #
> 
> +from types import *
> +
>  """
>  Changesets are an object representation of a set of changes to some
> files.
>  """
> @@ -62,14 +64,16 @@
>          return s
> 
>      def __eq__(self, other):
> -        return (self.name == other.name and
> +        return (type(other) != NoneType and
> +                self.name == other.name and
>                  self.old_name == other.old_name and
>                  self.old_revision == other.old_revision and
>                  self.new_revision == other.new_revision and
>                  self.action_kind == other.action_kind)
> 
>      def __ne__(self, other):
> -        return (self.name != other.name or
> +        return (type(other) == NoneType or
> +                self.name != other.name or
>                  self.old_name != other.old_name or
>                  self.old_revision != other.old_revision or
>                  self.new_revision != other.new_revision or
> 
> 
> This is not a perfect solution but works. (I don't know why was
> "other" NoneType.
> Possibly there is another bug somewhere in the code.)
> 
> I have attached the original file (original.py), the patched file
> (patched.py), and the diff (diff.txt)
> 
> If you have any question, please, let me know.
> 
> David Volgyes
> 


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

iD8DBQFKmDfRfAK/hT/mPgARAikDAKC3hTOZPLiMB5qqhyUTtr2Sn+slZwCeIx9Y
GLeUdwjcvnV0JSAoGky8HC8=
=PFWV
-----END PGP SIGNATURE-----