Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-02-17 09:37:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-07 16:44:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-02-17 09:37:41.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 11 14:08:06 CET 2014 - [email protected] + +- sync ACL at startup (bnc#863073) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.1/client/snapper.cc new/snapper-0.2.1/client/snapper.cc --- old/snapper-0.2.1/client/snapper.cc 2014-01-29 16:48:30.000000000 +0100 +++ new/snapper-0.2.1/client/snapper.cc 2014-02-14 11:25:44.000000000 +0100 @@ -1685,7 +1685,7 @@ cerr << _("Config is in use.") << endl; else if (name == "error.snapshot_in_use") cerr << _("Snapshot is in use.") << endl; - else if (name == "error.unknown_file_use") + else if (name == "error.unknown_file") cerr << _("Unknown file.") << endl; else if (name == "error.io_error") cerr << _("IO Error.") << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.1/snapper/Snapper.cc new/snapper-0.2.1/snapper/Snapper.cc --- old/snapper-0.2.1/snapper/Snapper.cc 2014-01-29 16:48:30.000000000 +0100 +++ new/snapper-0.2.1/snapper/Snapper.cc 2014-02-11 14:39:48.000000000 +0100 @@ -95,6 +95,10 @@ config_info->getValue(KEY_FSTYPE, fstype); filesystem = Filesystem::create(fstype, config_info->getSubvolume()); + bool sync_acl; + if (config_info->getValue(KEY_SYNC_ACL, sync_acl) && sync_acl == true) + syncAcl(); + y2mil("subvolume:" << config_info->getSubvolume() << " filesystem:" << filesystem->fstype()); @@ -533,7 +537,11 @@ { SDir infos_dir = openInfosDir(); - acl_t acl = acl_get_fd(infos_dir.fd()); + acl_t orig_acl = acl_get_fd(infos_dir.fd()); + if (!orig_acl) + throw AclException(); + + acl_t acl = acl_dup(orig_acl); if (!acl) throw AclException(); @@ -609,8 +617,9 @@ if (acl_calc_mask(&acl) != 0) throw AclException(); - if (acl_set_fd(infos_dir.fd(), acl) != 0) - throw AclException(); + if (acl_cmp(orig_acl, acl) == 1) + if (acl_set_fd(infos_dir.fd(), acl) != 0) + throw AclException(); if (acl_free(acl) != 0) throw AclException(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
