merge mirror-orphans into ubuntumirror

diff --git a/mirror-orphans b/mirror-orphans
deleted file mode 100755 (executable)
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 45186000fe6e8db33fed44ff113d085c243299f5..d18c168cc26feea84214cbaedf2c88ae0e768081 100755 (executable)
--- 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 <<EOF | python
+import sys
+sys.path.append('/home/martin/ubuntu/ddeb-retriever/')
+import archive_tools
+
+archive_tools.archive_cleanup('/mirror')
+EOF