From 062b7a2d9b0347e4e867e588826f052d26a3bb30 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Wed, 13 Apr 2011 01:11:20 -0500 Subject: For testing --- filter.py | 2 +- local_config.example | 4 ++-- main.sh | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/filter.py b/filter.py index c7f3f18..4b9603d 100755 --- a/filter.py +++ b/filter.py @@ -137,7 +137,7 @@ def pkginfo_from_db(path_to_db): try: dbsock = tarfile.open(path_to_db, 'r:gz') - desc_files=[desc for desc in db_open_tar.getnames() + desc_files=[desc for desc in dbsock.getnames() if "/desc" in desc] for name in desc_files: desc=dbsock.extractfile(name) diff --git a/local_config.example b/local_config.example index 8015ee2..99a1fdb 100644 --- a/local_config.example +++ b/local_config.example @@ -31,5 +31,5 @@ output="True" debug="False" # Rsync commands -rsync_update_command="rsync -av --delay-updates --exclude='*.{abs|db}.tar.*' " -rsync_post_command="rsync -av --delete --exclude='*.abs.tar.*' " \ No newline at end of file +rsync_update_command="rsync -nav --delay-updates --exclude='*.{abs|db}.tar.*' " +rsync_post_command="rsync -nav --delete --exclude='*.abs.tar.*' " \ No newline at end of file diff --git a/main.sh b/main.sh index 9f41a95..d15f736 100755 --- a/main.sh +++ b/main.sh @@ -29,8 +29,10 @@ stdnull "rm -rf ${pending}*" for repo in $(echo ${repo_list} | tr ':' ' '); do for arch in $(echo ${arch_list} | tr ':' ' '); do msg2 "Syncing ${repo} ${arch}" - ${rsync_post_command} --exclude-from=${rsync_blacklist} \ - ${mirror}${mirropath}/${repo} ${repodir}/${repo} + cmd=$(echo ${rsync_post_command} --exclude-from=${rsync_blacklist} \ + ${mirror}${mirropath}/${repo} ${repodir}/${repo}) + plain "${cmd}" + ${cmd} msg2 "Cleaning ${repo} ${arch}" # This also generates pending lists run_python_cmd "clean_repo.py -b ${repodir}/${repo}/os/${arch}/${repo}.db.tar.gz -d ${repodir}/${repo}/os/${arch}/" -- cgit v1.2.3-54-g00ecf