From 0869179b4f56b94ff43b76d45af4b3fd20f70ad3 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 6 Oct 2006 00:13:21 +0200 Subject: [PATCH] merge mirror-orphans into ubuntumirror --- mirror-orphans | 7 ------- ubuntu-mirror | 20 +++++++++----------- 2 files changed, 9 insertions(+), 18 deletions(-) delete mode 100755 mirror-orphans diff --git a/mirror-orphans b/mirror-orphans deleted file mode 100755 index c7c7f3f..0000000 --- a/mirror-orphans +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/python - -import sys -sys.path.append('/home/martin/ubuntu/ddeb-retriever/') -import archive_tools - -archive_tools.archive_cleanup('/mirror') diff --git a/ubuntu-mirror b/ubuntu-mirror index 4518600..d18c168 100755 --- a/ubuntu-mirror +++ b/ubuntu-mirror @@ -2,15 +2,13 @@ debmirror --dist hoary,hoary-updates,hoary-security,breezy,breezy-updates,breezy-security,dapper,dapper-updates,dapper-security --section main,restricted --arch none --source --progress --nocleanup --method http --ignore-release-gpg --host archive.ubuntu.com --exclude-deb-section translation --exclude 'openoffice.*amd.*tar.gz' --exclude 'ia32-libs*' --root ubuntu /mirror debmirror --dist dapper,dapper-updates,dapper-security --section main,restricted --arch i386 --no-source --progress --nocleanup --method http --ignore-release-gpg --host security.ubuntu.com --exclude-deb-section translation --exclude 'linux-(image|headers|source|patch|doc).*\.deb' --exclude '-dbg_.*\.deb' --root ubuntu /mirror -debmirror --dist breezy,breezy-updates,breezy-security,dapper,dapper-updates,dapper-security --section main,restricted --arch amd64 --no-source --progress --nocleanup --method http --ignore-release-gpg --host security.ubuntu.com --exclude-deb-section translation --exclude 'linux-(image|headers|source|patch|doc).*\.deb' --exclude 'ia32-libs*' --exclude '-dbg_.*\.deb' --root ubuntu /mirror +debmirror --dist breezy,breezy-updates,dapper,dapper-updates --section main,restricted --arch amd64 --no-source --progress --nocleanup --method http --ignore-release-gpg --host de.archive.ubuntu.com --exclude-deb-section translation --exclude 'linux-(image|headers|tree|source|patch|doc)[^/]*\.deb' --exclude 'ia32-libs*' --exclude '-dbg_.*\.deb' --root ubuntu /mirror +debmirror --dist breezy-security,dapper-security --section main,restricted --arch amd64 --no-source --progress --nocleanup --method http --ignore-release-gpg --host security.ubuntu.com --exclude-deb-section translation --exclude 'linux-(image|tree|source|patch|doc)[^/]*\.deb' --exclude 'ia32-libs*' --exclude '-dbg_.*\.deb' --root ubuntu /mirror -ORPHANS=`mirror-orphans` -if [ -n "$ORPHANS" ]; then - echo ---------------------- - echo Orphans: - /bin/echo -e "$ORPHANS" - read -p 'ok to remove? [y/N] ' a - if [ "$a" = y ]; then - rm -f $ORPHANS - fi -fi +cat <