Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2013-11-07 09:04:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2013-10-20 10:54:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2013-11-07 09:04:02.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 21 10:24:43 CEST 2013 - aschnell@suse.de + +- fixed inconsistency with default value for BACKGROUND_COMPARISON + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.7/client/utils/text.cc new/snapper-0.1.7/client/utils/text.cc --- old/snapper-0.1.7/client/utils/text.cc 2013-04-02 10:11:02.000000000 +0200 +++ new/snapper-0.1.7/client/utils/text.cc 2013-10-24 17:42:06.000000000 +0200 @@ -243,17 +243,12 @@ s += bytes_read; } // we're at the end of the string - else if (bytes_read == 0) + else { // print the rest of the text for(; *linep; ++linep) out << *linep; } - else - { - out << endl << "WCHAR ERROR" << endl; - return; - } } while(bytes_read > 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.7/doc/snapper-configs.xml.in new/snapper-0.1.7/doc/snapper-configs.xml.in --- old/snapper-0.1.7/doc/snapper-configs.xml.in 2013-10-16 17:50:00.000000000 +0200 +++ new/snapper-0.1.7/doc/snapper-configs.xml.in 2013-10-21 10:13:14.000000000 +0200 @@ -77,7 +77,7 @@ <listitem> <para>Defines whether pre and post snapshots should be compared in the background after creation.</para> - <para>Default value is "no".</para> + <para>Default value is "yes".</para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.7/pam/pam_snapper.c new/snapper-0.1.7/pam/pam_snapper.c --- old/snapper-0.1.7/pam/pam_snapper.c 2013-07-26 11:00:18.000000000 +0200 +++ new/snapper-0.1.7/pam/pam_snapper.c 2013-10-24 16:58:12.000000000 +0200 @@ -373,20 +373,20 @@ if ( setgid( gid ) != 0 || initgroups( pam_user, gid ) != 0 || setuid( uid ) != 0 ) { munmap( p, sizeof( *snapshot_num_out ) ); - exit( EXIT_FAILURE ); + _exit( EXIT_FAILURE ); } if ( cdbus_create_snapshot( snapper_conf, createmode, cleanup, num_user_data, user_data, snapshot_num_in, snapshot_num_out ) != 0 ) { munmap( p, sizeof( *snapshot_num_out ) ); - exit( EXIT_FAILURE ); + _exit( EXIT_FAILURE ); } memcpy( p, snapshot_num_out, sizeof( *snapshot_num_out ) ); munmap( p, sizeof( *snapshot_num_out ) ); - exit( EXIT_SUCCESS ); + _exit( EXIT_SUCCESS ); } else if ( child > 0 ) { @@ -494,17 +494,22 @@ ( pamh, "pam_snapper_snapshot_num", ( const void ** )&snapshot_num_in ) != PAM_SUCCESS ) { pam_syslog( pamh, LOG_ERR, "getting previous snapshot_num failed" ); + free( snapshot_num_out ); return -1; } } if ( forker( pamh, pam_user, uid, gid, snapper_conf, createmode, cleanup, num_user_data, user_data, snapshot_num_in, snapshot_num_out ) != 0 ) + { + free( snapshot_num_out ); return -1; + } if ( pam_set_data ( pamh, "pam_snapper_snapshot_num", snapshot_num_out, cleanup_snapshot_num ) != PAM_SUCCESS ) { + free( snapshot_num_out ); pam_syslog( pamh, LOG_ERR, "pam_set_data failed" ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.7/server/Client.cc new/snapper-0.1.7/server/Client.cc --- old/snapper-0.1.7/server/Client.cc 2013-10-08 17:05:19.000000000 +0200 +++ new/snapper-0.1.7/server/Client.cc 2013-10-21 10:20:11.000000000 +0200 @@ -921,8 +921,9 @@ Snapshots::iterator snap2 = snapper->createPostSnapshot(snap1, conn.get_unix_userid(msg), description, cleanup, userdata); - bool tmp; - if (it->getConfigInfo().getValue("BACKGROUND_COMPARISON", tmp) && tmp) + bool background_comparison = true; + it->getConfigInfo().getValue("BACKGROUND_COMPARISON", background_comparison); + if (background_comparison) backgrounds.add_task(it, snap1, snap2); DBus::MessageMethodReturn reply(msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.7/snapper/Btrfs.cc new/snapper-0.1.7/snapper/Btrfs.cc --- old/snapper-0.1.7/snapper/Btrfs.cc 2013-10-09 13:46:24.000000000 +0200 +++ new/snapper-0.1.7/snapper/Btrfs.cc 2013-10-24 17:36:37.000000000 +0200 @@ -982,7 +982,8 @@ { boost::this_thread::interruption_point(); - int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); + // remove the fourth parameter for older versions of libbtrfs + int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); if (r < 0) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org