diff options
| author | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
| commit | 728d6d3985126c2890638bb2ee24020fa0e36a80 (patch) | |
| tree | 1fcbb560b0103123d49fb953e86fdb960ee5dd13 /app/models/pgp_key.rb | |
| parent | b9174fdc9d9bd403d9a16650bafc4715e3dbf2d4 (diff) | |
| parent | 9fa52ed80d71ec56ed5acf18dfd63bd03b201cc5 (diff) | |
Merge tag '0.5.2'
Diffstat (limited to 'app/models/pgp_key.rb')
| -rw-r--r-- | app/models/pgp_key.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/pgp_key.rb b/app/models/pgp_key.rb index 66f8660..3384f4c 100644 --- a/app/models/pgp_key.rb +++ b/app/models/pgp_key.rb @@ -25,9 +25,10 @@ class PgpKey # allow comparison with plain keyblock strings. def ==(other) + return false if (self.present? != other.present?) self.equal?(other) or # relax the comparison on line ends. - self.to_s.tr_s("\n\r", '') == other.tr_s("\r\n", '') + self.to_s.tr_s("\n\r", '') == other.tr_s("\n\r", '') end protected |