[svn] r4750 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-21 01:14:07 +0200 (Thu, 21 Sep 2006)
New Revision: 4750

Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/yam
   trunk/tools/yam/yam.spec
Log:
Some more small updates.

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2006-09-20 22:18:45 UTC (rev 4749)
+++ trunk/tools/yam/ChangeLog	2006-09-20 23:14:07 UTC (rev 4750)
@@ -1,3 +1,8 @@
+* 0.8.3 - ... - released 21/09/2006
+- Fixed a problem with specific python versions (Justin B Hochstetler)
+- Fixed the non-functional -r option
+- Apply -r option to repository generation as well
+
 * 0.8.2 - Finally fixed - released 19/09/2006
 - Use exec in conjunction with system()
 - Fixed permission on cron entry

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-20 22:18:45 UTC (rev 4749)
+++ trunk/tools/yam/yam	2006-09-20 23:14:07 UTC (rev 4750)
@@ -20,7 +20,7 @@
 __version__ = "$Revision$"
 # $Source$
 
-VERSION = '0.8.2'
+VERSION = '0.8.2svn'
 
 archs = {
 	'i386': ('i386', 'i486', 'i586', 'i686', 'athlon'),
@@ -131,7 +131,7 @@
   -g, --generate          generate Yam repositories
   -n, --dry-run           show what would have been done
   -q, --quiet             minimal output
-  -r, --repo=repo1,repo2  restrict download to these repos
+  -r, --repo=repo1,repo2  restrict action to specific repositories
       --remount           remount distribution ISOs
   -u, --update            fetch OS updates
   -v, --verbose           increase verbosity
@@ -364,19 +364,12 @@
 	def listrepos(self, names=None):
 		ret = []
 		for repo in self.repos:
-			if names and repo.name in names:
+			if not names:
 				ret.append(repo)
-			else:
+			elif repo.name in names:
 				ret.append(repo)
 		return ret
 
-	def listchangedrepos(self):
-		ret = []
-		for repo in self.repos:
-			if repo.changed:
-				ret.append(repo)
-		return ret
-
 	def lock(self, action, repo=''):
 		lockfile = os.path.join(cf.lockdir, self.nick, action + '-' + repo + '.lock')
 		mkdir(os.path.dirname(lockfile))
@@ -489,6 +482,10 @@
 		self.changed = False
 		self.skip = False
 
+	def __repr__(self):
+#		return "%s/%s" % (self.dist.nick, self.name)
+		return self.name
+
 	def mirror(self):
 		"Check URL and pass on to mirror-functions."
 		global exitcode
@@ -630,7 +627,6 @@
 			opts = ' --quiet' + opts
 		elif op.verbose >= 4:
 			opts = ' -v' + opts
-#		for repo in self.listchangedrepos():
 		if os.path.isdir(self.wwwdir):
 			repoopts = opts
 			if cf.cachedir:
@@ -1380,7 +1376,7 @@
 
 	### Generating metadata for available distributions/repositories
 	for dist in dists:
-		repos = dist.listrepos()
+		repos = dist.listrepos(op.repos)
 
 		info(1, '%s: Generating %s meta-data' % (dist.nick, dist.name))
 		if not dist.lock('generate'):

Modified: trunk/tools/yam/yam.spec
===================================================================
--- trunk/tools/yam/yam.spec	2006-09-20 22:18:45 UTC (rev 4749)
+++ trunk/tools/yam/yam.spec	2006-09-20 23:14:07 UTC (rev 4750)
@@ -4,7 +4,7 @@
 
 Summary: Tool to set up a Yum/Apt mirror from various sources (ISO, RHN, rsync, http, ftp, ...)
 Name: yam
-Version: 0.8.2
+Version: 0.8.2svn
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -101,6 +101,9 @@
 %{_localstatedir}/yam/
 
 %changelog
+* Thu Sep 21 2006 Dag Wieers <dag at wieers.com> - 0.8.2svn-1
+- Updated to release 0.8.2svn.
+
 * Tue Sep 19 2006 Dag Wieers <dag at wieers.com> - 0.8.2-1
 - Updated to release 0.8.2.