Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2011-10-26 15:45:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotwell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2011-10-16 12:59:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2011-10-26 15:46:17.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Oct 19 09:27:38 UTC 2011 - [email protected] + +- Update to version 0.11.5: + + Fixes a collection concurrent access issue that could cause + Shotwell to crash during F-Spot import for users still + affected by this issue even after installing Shotwell 0.11.4. + +------------------------------------------------------------------- Old: ---- shotwell-0.11.4.tar.bz2 New: ---- shotwell-0.11.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.uApdOm/_old 2011-10-26 15:46:25.000000000 +0200 +++ /var/tmp/diff_new_pack.uApdOm/_new 2011-10-26 15:46:25.000000000 +0200 @@ -18,7 +18,7 @@ Name: shotwell -Version: 0.11.4 +Version: 0.11.5 Release: 1 # FIXME: Check if the hack to remove --fatal-warnings is still required. Also see http://redmine.yorba.org/issues/3760 License: LGPLv2.1+ ++++++ shotwell-0.11.4.tar.bz2 -> shotwell-0.11.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shotwell-0.11.4/Makefile new/shotwell-0.11.5/Makefile --- old/shotwell-0.11.4/Makefile 2011-10-13 21:26:06.000000000 +0200 +++ new/shotwell-0.11.5/Makefile 2011-10-18 20:23:51.000000000 +0200 @@ -1,7 +1,7 @@ PROGRAM = shotwell PROGRAM_THUMBNAILER = shotwell-video-thumbnailer -VERSION = 0.11.4 +VERSION = 0.11.5 GETTEXT_PACKAGE = $(PROGRAM) BUILD_ROOT = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shotwell-0.11.4/NEWS new/shotwell-0.11.5/NEWS --- old/shotwell-0.11.4/NEWS 2011-10-13 21:56:10.000000000 +0200 +++ new/shotwell-0.11.5/NEWS 2011-10-18 20:53:08.000000000 +0200 @@ -1,3 +1,11 @@ +Shotwell 0.11.5 - 18 October 2011 - "I hate anyone that ever had a pony" +--------------------------------------------------------------------- + + * Fixes a collection concurrent access issue that could cause + Shotwell to crash during F-Spot import for users still + affected by this issue even after installing Shotwell 0.11.4. + + Shotwell 0.11.4 - 13 October 2011 - "The Pony Remark" --------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shotwell-0.11.4/src/BatchImport.vala new/shotwell-0.11.5/src/BatchImport.vala --- old/shotwell-0.11.4/src/BatchImport.vala 2011-10-13 21:22:54.000000000 +0200 +++ new/shotwell-0.11.5/src/BatchImport.vala 2011-10-17 23:00:45.000000000 +0200 @@ -153,6 +153,7 @@ // filesize should only be returned if BatchImportJob represents a single file. public abstract bool determine_file_size(out uint64 filesize, out File file_or_dir); + // NOTE: prepare( ) is called from a background thread in the worker pool public abstract bool prepare(out File file_to_import, out bool copy_to_library) throws Error; // Completes the import for the new library photo once it's been imported. @@ -161,6 +162,8 @@ // that have been successfully imported. // // Returns true if any action was taken, false otherwise. + // + // NOTE: complete( )is called from the foreground thread public virtual bool complete(MediaSource source, BatchImportRoll import_roll) throws Error { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shotwell-0.11.4/src/alien_db/AlienDatabaseImportJob.vala new/shotwell-0.11.5/src/alien_db/AlienDatabaseImportJob.vala --- old/shotwell-0.11.4/src/alien_db/AlienDatabaseImportJob.vala 2011-10-13 21:22:54.000000000 +0200 +++ new/shotwell-0.11.5/src/alien_db/AlienDatabaseImportJob.vala 2011-10-17 23:03:48.000000000 +0200 @@ -15,6 +15,7 @@ private uint64 filesize; private time_t exposure_time; private AlienDatabaseImportJob? associated = null; + private HierarchicalTagIndex? detected_htags = null; public AlienDatabaseImportJob(AlienDatabaseImportSource import_source) { this.import_source = import_source; @@ -85,15 +86,7 @@ file_to_import = src_file; copy_to_library = false; - HierarchicalTagIndex? detected_htags = - build_exclusion_index(import_source.get_photo().get_tags()); - - if (detected_htags != null) { - Gee.Collection<string> paths = detected_htags.get_all_paths(); - - foreach (string path in paths) - Tag.for_path(path); - } + detected_htags = build_exclusion_index(import_source.get_photo().get_tags()); return true; } @@ -106,6 +99,13 @@ AlienDatabasePhoto src_photo = import_source.get_photo(); // tags + if (detected_htags != null) { + Gee.Collection<string> paths = detected_htags.get_all_paths(); + + foreach (string path in paths) + Tag.for_path(path); + } + Gee.Collection<AlienDatabaseTag> src_tags = src_photo.get_tags(); foreach (AlienDatabaseTag src_tag in src_tags) { string? prepped = HierarchicalTagUtilities.join_path_components( -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
