OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-tools Date: 14-Oct-2006 19:35:06 Branch: HEAD Handle: 2006101418350500 Modified files: openpkg-tools/cmd bf-mk.pl Log: buildfarm master support for changed ftp server layout Summary: Revision Changes Path 1.44 +17 -2 openpkg-tools/cmd/bf-mk.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-tools/cmd/bf-mk.pl ============================================================================ $ cvs diff -u -r1.43 -r1.44 bf-mk.pl --- openpkg-tools/cmd/bf-mk.pl 29 Sep 2006 19:31:36 -0000 1.43 +++ openpkg-tools/cmd/bf-mk.pl 14 Oct 2006 17:35:05 -0000 1.44 @@ -274,7 +274,7 @@ sub createsharedstructure($) { my ($shared) = @_; - foreach my $dir (qw(bin ctl dst log src src/master src/master.norestriction tmp tmp/master)) { + foreach my $dir (qw(bin ctl dst log src src/master.mirror src/master src/master.norestriction tmp tmp/master)) { my $target = $shared . "/" . $dir; &verbose("creating $target/"); if (not -d $target) { @@ -315,7 +315,22 @@ # download sources and remove those to be skipped &shtoolechoe("%B++ MASTER:$shared: download sources and remove those to be skipped%b"); - system("$rsync -rt --perms --chmod=ug+w,a+r --delete --exclude \"Makefile*\" \"$source\" \"$shared/src/master/\"") == 0 || die("cannot rsync source RPMs from \"$source\" ($!)"); + system("$rsync -rt --perms --chmod=ug+w,a+r --delete --exclude \"Makefile*\" \"$source\" \"$shared/src/master.mirror/\"") == 0 || die("cannot rsync source RPMs from \"$source.mirror\" ($!)"); + unlink (<$shared/src/master/*.src.rpm>) || warn "cannot unlink source RPMs from \"$source\" ($!)"; + foreach my $package (<$shared/src/master.mirror/*/*.src.rpm>) { + next unless $package =~ m|^.*/([^/]+)/([^/]+)\.src\.rpm$|; + my $class; + ($class, $package) = ($1, $2); + next unless ($classes =~ m|\+$class|); + my $source="$shared/src/master.mirror/$class/$package.src.rpm"; + my $target="$shared/src/master/$package.src.rpm"; + if (-f $source) { + link $source, $target || die "cannot link \"$source\" to \"$target\""; + } + else { + warn "$source not available"; + } + } foreach my $p (split(/ /, $skippkg)) { #FIXME obey name-version-release instead only unlinking for my $f (<$shared/src/master/$p>) { @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org