From 90e65d8302dc3f7c887a80a65e4ca27f3913e277 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 18 Sep 2004 19:38:01 +0000 Subject: [PATCH] Clifford Wolf: Fixed ordering of packages file for pkgforking and other funny stuff. Create-PkgQueue now again works as expected .. [2004091518534510456] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4318 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Config | 3 +++ scripts/Create-PkgQueue | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/Config b/scripts/Config index d6b98df32..0beaf4629 100755 --- a/scripts/Config +++ b/scripts/Config @@ -220,6 +220,9 @@ export ROCKCFG_ID="$rockver"; pkgin; . src/rockconfig.in; pkgout echo "export ROCKCFG_ID='$ROCKCFG_ID'" >> config/$config.$swpid/config rm -f config/$config.$swpid/*.tmp +sort -k3 config/$config.$swpid/packages > config/$config.$swpid/packages.sorted +mv -f config/$config.$swpid/packages.sorted config/$config.$swpid/packages + cut -f1,2,4,5,8- -d' ' config/$config.$swpid/packages | sed 's, [^ ]*$,,' | \ tr ' ' '\t' | expand -t2,15,35, > config/$config.$swpid/packages.txt diff --git a/scripts/Create-PkgQueue b/scripts/Create-PkgQueue index d71c28523..c7f74150d 100755 --- a/scripts/Create-PkgQueue +++ b/scripts/Create-PkgQueue @@ -73,7 +73,6 @@ function check_package() { gsub("", "err", errfile); gsub("", "out", outfile); - if ( (getline dummy < logfile == -1) && (getline dummy < errfile == -1) ) { build_this_package = 1; @@ -141,7 +140,7 @@ function check_package() { if ( stagelevel < 9 ) stage9_no_deps = "x"; - # A packages without dependencies automatically depend + # Packages without dependencies automatically depend # on all packages build before it if (found_dependencies == 0 && not_present != "" && stagelevel != stage9_no_deps)