From daa1f24937c6791ad14cf38b06743a53759e4fa4 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 28 Sep 2012 22:12:26 +0200 Subject: [PATCH] correctly import all relevant profitbricks repos --- debian_packages2db.py | 1 - debian_repos2db.sh | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian_packages2db.py b/debian_packages2db.py index 225a915..f8dadde 100755 --- a/debian_packages2db.py +++ b/debian_packages2db.py @@ -24,7 +24,6 @@ if __name__ == '__main__': tmp = tempfile.NamedTemporaryFile(delete=False) cmd = ['egrep', '(^Package:|^Version:)', packages_file] - print cmd egrep = subprocess.Popen( cmd, stdout=tmp, diff --git a/debian_repos2db.sh b/debian_repos2db.sh index 401bec7..fd26667 100755 --- a/debian_repos2db.sh +++ b/debian_repos2db.sh @@ -1,26 +1,30 @@ #!/bin/bash + REPO_SUITES[0]="squeeze profitbricks-backports profitbricks-backports-proposed-updates profitbricks-backports-pre-staging" REPO_SECTIONS[0]="main contrib non-free" REPO_BASE_URL[0]="http://alexandria/debian-mirror/dists/SUITE/SECTION/binary-amd64/" REPO_SUITES[1]="production-approved-updates production-proposed-updates production pre-staging" -REPO_SECTION[1]="main contrib non-free" +REPO_SECTIONS[1]="main contrib non-free" REPO_BASE_URL[1]="http://alexandria/profitbricks-repository/dists/SUITE/SECTION/binary-amd64/" REPO_SUITES[2]="pool" -REPO_SECTION[2]="main non-free" -REPO_BASE_URL[2]="http://alexandria.profitbricks.localdomain/profitbricks-repository/SUITE/SECTION/" +REPO_SECTIONS[2]="main non-free" +REPO_BASE_URL[2]="http://alexandria/profitbricks-repository/SUITE/SECTION/" + +REPOS=2 -for RUN in 0 1 ; do - if [ "$RUN" == 0 ] ; then +for REPO in $(seq 0 $REPOS) ; do + if [ "$REPO" == 0 ] ; then ORIGIN=debian else ORIGIN=profitbricks fi - for SUITE in ${REPO_SUITES[$RUN]} ; do - for SECTION in ${REPO_SECTIONS[$RUN]} ; do - URL=$(echo ${REPO_BASE_URL[$RUN]} | sed -s "s#SUITE#$SUITE#" | sed -s "s#SECTION#$SECTION#")/Packages + for SUITE in ${REPO_SUITES[$REPO]} ; do + for SECTION in ${REPO_SECTIONS[$REPO]} ; do + URL=$(echo ${REPO_BASE_URL[$REPO]} | sed -s "s#SUITE#$SUITE#" | sed -s "s#SECTION#$SECTION#")/Packages + echo $URL wget $URL -o /dev/null [ -s Packages ] && ./debian_packages2db.py Packages $ORIGIN rm Packages -- 2.39.5