[svn] r4770 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-25 17:42:03 +0200 (Mon, 25 Sep 2006)
New Revision: 4770

Modified:
   trunk/tools/yam/Makefile
   trunk/tools/yam/yam
   trunk/tools/yam/yam.spec
Log:
Make yam reusable (Oliver Falk)

Modified: trunk/tools/yam/Makefile
===================================================================
--- trunk/tools/yam/Makefile	2006-09-25 15:01:42 UTC (rev 4769)
+++ trunk/tools/yam/Makefile	2006-09-25 15:42:03 UTC (rev 4770)
@@ -32,7 +32,7 @@
 	install -d -m0755 $(DESTDIR)$(htmldir)
 	install -p -m0644 html/* $(DESTDIR)$(htmldir)
 
-	install -d -m0755 $(DESTDIR)$(srcdir)/all/local/
+	install -d -m0755 $(DESTDIR)$(srcdir)/all/
 	install -d -m0755 $(DESTDIR)$(wwwdir)
 	install -d -m0755 $(DESTDIR)$(cachedir)
 

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-25 15:01:42 UTC (rev 4769)
+++ trunk/tools/yam/yam	2006-09-25 15:42:03 UTC (rev 4770)
@@ -1394,6 +1394,16 @@
 	except:
 		info(1, 'Sending mail via %s failed.' % cf.smtpserver)
 
+def readconfig():
+	cf = Config()
+	if cf.confdir and os.path.isdir(cf.confdir):
+		files = glob.glob(os.path.join(cf.confdir, '*.conf'))
+		files.sort()
+		for configfile in files:
+			cf.read(configfile)
+			cf.update(configfile)
+	return cf
+
 def main():
 	### Check availability of commands
 	for cmd in cf.cmd.keys():
@@ -1546,7 +1556,6 @@
 	if cf.hardlink and not op.dists:
 		hardlink(cf.srcdir)
 
-              
 ### Unbuffered sys.stdout
 sys.stdout = os.fdopen(1, 'w', 0)
 sys.stderr = os.fdopen(2, 'w', 0)
@@ -1563,13 +1572,7 @@
 	exitcode = 0
 
 	op = Options(sys.argv[1:])
-	cf = Config()
-	if cf.confdir and os.path.isdir(cf.confdir):
-		files = glob.glob(os.path.join(cf.confdir, '*.conf'))
-		files.sort()
-		for configfile in files:
-			cf.read(configfile)
-			cf.update(configfile)
+	cf = readconfig()
 	try:
 		main()
 	except KeyboardInterrupt, e:
@@ -1577,6 +1580,6 @@
 #	except OSError, e:
 #		print e.errno
 #		die(7, 'OSError: %s' % e)
-sys.exit(exitcode)
+	sys.exit(exitcode)
 
 # vim:ts=4:sw=4

Modified: trunk/tools/yam/yam.spec
===================================================================
--- trunk/tools/yam/yam.spec	2006-09-25 15:01:42 UTC (rev 4769)
+++ trunk/tools/yam/yam.spec	2006-09-25 15:42:03 UTC (rev 4770)
@@ -93,10 +93,11 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README THANKS TODO WISHLIST config/* docs/
+%config(noreplace) %{_sysconfdir}/cron.d/yam
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/yam.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/yam
 %config(noreplace) %{_sysconfdir}/yam.conf
 %config(noreplace) %{_sysconfdir}/yam.conf.d/
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/yam.conf
-%config(noreplace) %{_sysconfdir}/cron.d/yam
 %config %{_initrddir}/yam
 %{_bindir}/gensystemid
 %{_bindir}/yam