From 0eeb4b0ade1e47560919e406306c07c3c436e5c5 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Sat, 18 Sep 2010 16:51:01 +0000 Subject: [PATCH] New volatile implementation Signed-off-by: Mark Hymers --- config/debian/apt.conf | 38 +---------------- config/debian/dak.conf | 92 ----------------------------------------- daklib/.queue.py.swp | Bin 0 -> 16384 bytes 3 files changed, 1 insertion(+), 129 deletions(-) create mode 100644 daklib/.queue.py.swp diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 733e6025..9822577a 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -44,30 +44,6 @@ tree "dists/proposed-updates" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile" -{ - FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; - -tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; - tree "dists/testing" { FakeDI "dists/unstable"; @@ -92,7 +68,7 @@ tree "dists/testing-proposed-updates" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile" +tree "dists/squeeze-volatile" { FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list"; @@ -104,18 +80,6 @@ tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source"; - BinOverride "override.squeeze.$(SECTION)"; - ExtraOverride "override.squeeze.extra.$(SECTION)"; - SrcOverride "override.squeeze.$(SECTION).src"; - Contents " "; -}; - tree "dists/unstable" { FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 648be641..e50a5c7a 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -255,67 +255,6 @@ Suite }; }; - Lenny-Volatile - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - - }; - - Lenny-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - }; - Testing { Components @@ -412,37 +351,6 @@ Suite }; - Squeeze-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; - Unstable { Components diff --git a/daklib/.queue.py.swp b/daklib/.queue.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..ae9266885dcc4517c5704fa90ec19a05a16623cc GIT binary patch literal 16384 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 VY;HT|*w%w)0Xg%QENbMme*uxMCFlSE literal 0 HcmV?d00001 -- 2.39.5