From b8a883720066e4f91b162ea91719f9a0f15958ed Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Tue, 19 Apr 2011 21:38:28 -0500 Subject: Another fix --- clean_repo.py | 6 ++---- config | 3 ++- repo-update | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/clean_repo.py b/clean_repo.py index bc401b5..6f3d632 100755 --- a/clean_repo.py +++ b/clean_repo.py @@ -80,11 +80,9 @@ if __name__ == "__main__": args=parser.parse_args() - if not args.directory and not args.database: - parser.print_help() - elif not args.pending_file or not args.whitelist_file \ - and args.database: + if args.database and not (args.pending_file and args.whitelist_file): parser.print_help() + exit(1) blacklisted=listado(args.blacklist_file) diff --git a/config b/config index 300893a..7180f9e 100644 --- a/config +++ b/config @@ -1,7 +1,8 @@ FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" -PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing' 'multilib') +ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') +PKGREPOS=(${ARCHREPOS[@]} 'libre' 'libre-testing' 'social' 'sugar') PKGPOOL='pool/packages' SRCPOOL='sources/packages' diff --git a/repo-update b/repo-update index 719ab0c..7241507 100755 --- a/repo-update +++ b/repo-update @@ -5,7 +5,7 @@ source config source local_config source libremessages -for repo in ${PKGREPOS[@]}; do +for repo in ${ARCHREPOS[@]}; do for arch in 'i686' 'x86_64' 'any'; do msg "Syncing ${repo} ${arch}" # makes a file containing rsync output for filter.py -- cgit v1.2.3-54-g00ecf