← Back to branch summary

~ubuntu-branches/ubuntu/wily/gramps/wily

« back to all changes in this revision

Viewing changes to gramps/gen/lib/place.py

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-05-16 11:49:41 UTC
  • mfrom: (39.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20150516114941-hiku87mi6p7wbjba
Tags: 4.1.3~dfsg-1
https://launchpad.net/bugs/1427444
http://bugs.debian.org/785393
* New upstream release
* Fixes manpage desription of import function (LP: #1427444)
* Fixes crash when closing detatched gramplet (Closes: #785393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gramps/gen/lib/place.py
571
571
        :param acquisition: instance to merge
572
572
        :type acquisition: :class:'~.place.Place
573
573
        """
574
 
        if acquisition.name not in self.alt_names:
 
574
        if acquisition.name and (acquisition.name not in self.alt_names):
575
575
            self.alt_names.append(acquisition.name)
576
576
 
577
577
        for addendum in acquisition.alt_names: