Merge repo-maintainer into dbscripts. Repo-maintainer will be abandoned as

of this commit.

Merge ssh://vparabola/srv/git/projects/repo-maintainer

Conflicts:
	db-functions

1 files changed, 13 insertions, 12 deletions

diff --git a/repo-update b/repo-update
index 59a0658..2354e0a 100755
--- a/repo-update
+++ b/repo-update
@@ -1,24 +1,25 @@
 #!/bin/bash
 # -*- coding: utf-8 -*-
 
-source ./config
-source ./local_config
-source ./libremessages
+source config
+source local_config
+source libremessages
 
 for repo in ${PKGREPOS[@]}; do
     for arch in ${ARCHES[@]} 'any'; do
 	msg "Syncing ${repo} ${arch}"
-	filter.py -r "${rsync_blacklist}" -k "${blacklist}" -c \
-	    \"${rsync_list_command}\ \
-	    ${mirror}${mirrorpath}/${repo}/os/${arch}\ \
-	    ${repodir}/${repo}/\"
-	find ${repodir}/${repo} -name *${PKGEXT} -print \
-	    > ${rsync_not_needed}
+	${rsync_list_command} \
+	    ${mirror}::${mirrorpath}/${repo}/os/${arch}/ \
+	    ${repodir}/${repo}/ > ${rsout_file}
+	filter.py -r ${rsync_blacklist} -k ${blacklist} \
+	    -f ${rsout_file}
+	find ${repodir}/${repo} -name *${PKGEXT} \
+	    -fprint ${rsync_not_needed}
 	${rsync_update_command} \
-	    ${mirror}${mirrorpath}/${repo}/os/${arch} \
-	    ${repodir}/${repo} \
 	    --exclude-from=${rsync_blacklist} \
 	    --exclude-from=${rsync_not_needed}
+	    ${mirror}::${mirrorpath}/${repo}/os/${arch}/ \
+	    ${repodir}/${repo}/
     done
     for arch in ${ARCHES[@]}; do
 	if [ -r ${repodir}/${repo}/os/${arch}/${repo}${DBEXT} ]; then
@@ -26,7 +27,7 @@ for repo in ${PKGREPOS[@]}; do
 		-p ${docs_dir}/pending-${repo} \
 		-b ${repodir}/${repo}/${repo}${DBEXT}
 	fi
-	clean_repo.py -k ${blacklist} -d ${repodir}/${repo}
+	python clean_repo.py -k ${blacklist} -d ${repodir}/${repo}
     done
 done