Hello community, here is the log from the commit of package hal-resmgr checked in at Fri Jul 13 18:22:21 CEST 2007. -------- --- hal-resmgr/hal-resmgr.changes 2007-06-12 14:21:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal-resmgr/hal-resmgr.changes 2007-07-11 17:24:14.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 11 17:24:06 CEST 2007 - lnussel@suse.de + +- don't run hal-resmgr in the remove case + +------------------------------------------------------------------- Old: ---- hal-resmgr-0.1_SVNr140.tar.bz2 New: ---- hal-resmgr-0.1_SVNr141.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-resmgr.spec ++++++ --- /var/tmp/diff_new_pack.C31926/_old 2007-07-13 18:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.C31926/_new 2007-07-13 18:21:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hal-resmgr (Version 0.1_SVNr140) +# spec file for package hal-resmgr (Version 0.1_SVNr141) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,9 +12,9 @@ Name: hal-resmgr BuildRequires: hal-devel libacl-devel resmgr -License: GNU General Public License (GPL), It's forked off lshal.c which is dual licensed GPL/Academic Free License +License: GPL v2 or later, It's forked off lshal.c which is dual licensed GPL/Academic Free License Group: System/Daemons -Version: 0.1_SVNr140 +Version: 0.1_SVNr141 Release: 1 Summary: Install ACLs on device nodes Source: %{name}-%{version}.tar.bz2 @@ -58,6 +58,8 @@ %{_libdir}/hal/scripts/hal-resmgr-revoke %changelog +* Wed Jul 11 2007 - lnussel@suse.de +- don't run hal-resmgr in the remove case * Tue Jun 12 2007 - lnussel@suse.de - remove obsolete usb hacks (#250659) * Mon Apr 16 2007 - lnussel@suse.de ++++++ hal-resmgr-0.1_SVNr140.tar.bz2 -> hal-resmgr-0.1_SVNr141.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr140/facl.c new/hal-resmgr-0.1_SVNr141/facl.c --- old/hal-resmgr-0.1_SVNr140/facl.c 2006-09-05 14:20:29.000000000 +0200 +++ new/hal-resmgr-0.1_SVNr141/facl.c 2007-07-11 17:23:26.000000000 +0200 @@ -107,7 +107,7 @@ { struct stat stb; int ret = -1; - acl_t acl; + acl_t acl = NULL; acl_entry_t entry; if(stat(fn, &stb) == -1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr140/hal-resmgr.c new/hal-resmgr-0.1_SVNr141/hal-resmgr.c --- old/hal-resmgr-0.1_SVNr140/hal-resmgr.c 2007-06-12 14:20:23.000000000 +0200 +++ new/hal-resmgr-0.1_SVNr141/hal-resmgr.c 2007-07-11 17:23:26.000000000 +0200 @@ -620,8 +620,15 @@ if(udi && !login_users && !logout_users) { - resmgr_get_users(); - process_device(udi); + const char* action = getenv("HALD_ACTION"); + if(!action) + DIE(("$HALD_ACTION not set")); + + if(!strcmp(action, "add")) // only need to set ACLs on new devices + { + resmgr_get_users(); + process_device(udi); + } } else main_dbus(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr140/resmgr-callouts.fdi new/hal-resmgr-0.1_SVNr141/resmgr-callouts.fdi --- old/hal-resmgr-0.1_SVNr140/resmgr-callouts.fdi 2007-06-12 14:20:23.000000000 +0200 +++ new/hal-resmgr-0.1_SVNr141/resmgr-callouts.fdi 2007-07-11 17:23:26.000000000 +0200 @@ -21,7 +21,9 @@ </match> <append key="info.callouts.add" type="strlist">hal-resmgr</append> + <!-- we don't need that anymore <append key="info.callouts.remove" type="strlist">hal-resmgr</append> + --> <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.resmgr</append> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org