Date: Thu, 11 Jun 2009 02:46:30 GMT From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 164067 for review Message-ID: <200906110246.n5B2kUv4096624@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164067 Change 164067 by alepulver@alepulver_deimos on 2009/06/11 02:46:11 - Handle .conf files properly. - Fix non-standard "%" in printf() string (a literal '%' should be "%%" to avoid confusion with other placeholders), which generated invalid configuration files. - Write temporary file to /var/tmp instead of root directory. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#3 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-common__Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__lockfs.c#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__mkschedconf.c#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#3 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#3 (text+ko) ==== @@ -11,7 +11,6 @@ # archivers/rpm4 -> archivers/rpm2cpio # # TODO: -# - Handle .conf files properly. (**WARNING**: now deletes .conf files) # - Investigate scheduler problem when starting some agents. # ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#3 (text+ko) ==== @@ -3,11 +3,21 @@ bin/fossinit bin/fossjobs bin/fosslic -%%ETCDIR%%/Db.conf -%%ETCDIR%%/Depth.conf -%%ETCDIR%%/Hosts.conf -%%ETCDIR%%/Proxy.conf -%%ETCDIR%%/RepPath.conf +@unexec if cmp -s %D/etc/fossology/Db.conf %D/etc/fossology/Db.conf.sample; then rm -f %D/etc/fossology/Db.conf; fi +etc/fossology/Db.conf.sample +@exec [ -f %D/etc/fossology/Db.conf ] || cp %D/etc/fossology/Db.conf.sample %D/etc/fossology/Db.conf +@unexec if cmp -s %D/etc/fossology/Depth.conf %D/etc/fossology/Depth.conf.sample; then rm -f %D/etc/fossology/Depth.conf; fi +etc/fossology/Depth.conf.sample +@exec [ -f %D/etc/fossology/Depth.conf ] || cp %D/etc/fossology/Depth.conf.sample %D/etc/fossology/Depth.conf +@unexec if cmp -s %D/etc/fossology/Hosts.conf %D/etc/fossology/Hosts.conf.sample; then rm -f %D/etc/fossology/Hosts.conf; fi +etc/fossology/Hosts.conf.sample +@exec [ -f %D/etc/fossology/Hosts.conf ] || cp %D/etc/fossology/Hosts.conf.sample %D/etc/fossology/Hosts.conf +@unexec if cmp -s %D/etc/fossology/Proxy.conf %D/etc/fossology/Proxy.conf.sample; then rm -f %D/etc/fossology/Proxy.conf; fi +etc/fossology/Proxy.conf.sample +@exec [ -f %D/etc/fossology/Proxy.conf ] || cp %D/etc/fossology/Proxy.conf.sample %D/etc/fossology/Proxy.conf +@unexec if cmp -s %D/etc/fossology/RepPath.conf %D/etc/fossology/RepPath.conf.sample; then rm -f %D/etc/fossology/RepPath.conf; fi +etc/fossology/RepPath.conf.sample +@exec [ -f %D/etc/fossology/RepPath.conf ] || cp %D/etc/fossology/RepPath.conf.sample %D/etc/fossology/RepPath.conf include/libfossdb.h include/libfossrepo.h lib/fossology/agents/Filter_License
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906110246.n5B2kUv4096624>