OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 26-Jan-2005 15:03:53
Branch: HEAD Handle: 2005012614035200
Modified files:
openpkg-tools/cmd bf-db.pl bf-ui.pl build.pl index.pl src2make.pl
Log:
whitespace cosmetics - get rid of tabs and trailing spaces
Summary:
Revision Changes Path
1.3 +8 -8 openpkg-tools/cmd/bf-db.pl
1.3 +6 -6 openpkg-tools/cmd/bf-ui.pl
1.10 +12 -12 openpkg-tools/cmd/build.pl
1.4 +14 -14 openpkg-tools/cmd/index.pl
1.3 +13 -13 openpkg-tools/cmd/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-db.pl
============================================================================
$ cvs diff -u -r1.2 -r1.3 bf-db.pl
--- openpkg-tools/cmd/bf-db.pl 26 Jan 2005 13:59:37 -0000 1.2
+++ openpkg-tools/cmd/bf-db.pl 26 Jan 2005 14:03:52 -0000 1.3
@@ -186,7 +186,7 @@
if (not $rv) {
print STDERR "ERROR:$0: SQLite error: ".$dbh->errstr."\n";
exit(2);
- }
+ }
$sth = $dbh->prepare(
"INSERT INTO processing ( " .
@@ -319,13 +319,13 @@
exit(2);
}
- my $tables = $dbh->selectall_hashref("SELECT name FROM sqlite_master
WHERE type='table' ORDER BY name;", "name");
+ my $tables = $dbh->selectall_hashref("SELECT name FROM sqlite_master
WHERE type='table' ORDER BY name;", "name");
- unless ($tables->{status}) {
+ unless ($tables->{status}) {
printf STDERR "DEBUG:$0: creating \"status\" table in database file
\"%s\"\n", $dbfile if ($opt_verbose);
my $sql = '';
$sql .= "CREATE TABLE status"; # field
description | example
- $sql .= "(\n"; #
-----------------------------------+-----------
+ $sql .= "(\n"; #
-----------------------------------+-----------
$sql .= " st_inst_host TEXT NOT NULL,\n"; # 1st p.
PLATFORM in Makefile.rules | bsd1
$sql .= " st_inst_arch TEXT NOT NULL,\n"; # 2st p.
PLATFORM in Makefile.rules | ix86
$sql .= " st_inst_os TEXT NOT NULL,\n"; # 3rd p.
PLATFORM in Makefile.rules | freebsd5.3
@@ -343,11 +343,11 @@
$dbh->do($sql);
};
- unless ($tables->{processing}) {
+ unless ($tables->{processing}) {
printf STDERR "DEBUG:$0: creating \"processing\" table in database
file \"%s\"\n", $dbfile if ($opt_verbose);
my $sql = '';
$sql .= "CREATE TABLE processing"; # field
description | example
- $sql .= "(\n"; #
-----------------------------------+-----------
+ $sql .= "(\n"; #
-----------------------------------+-----------
$sql .= " pr_inst_host TEXT NOT NULL,\n"; # 1st p.
PLATFORM in Makefile.rules | bsd1
$sql .= " pr_inst_arch TEXT NOT NULL,\n"; # 2st p.
PLATFORM in Makefile.rules | ix86
$sql .= " pr_inst_os TEXT NOT NULL,\n"; # 3rd p.
PLATFORM in Makefile.rules | freebsd5.3
@@ -361,11 +361,11 @@
$dbh->do($sql);
};
- unless ($tables->{class}) {
+ unless ($tables->{class}) {
printf STDERR "DEBUG:$0: creating \"class\" table in database file
\"%s\"\n", $dbfile if ($opt_verbose);
my $sql = '';
$sql .= "CREATE TABLE class"; # field
description | example
- $sql .= "(\n"; #
-----------------------------------+-----------
+ $sql .= "(\n"; #
-----------------------------------+-----------
$sql .= " cl_package_name TEXT NOT NULL,\n"; # 1st part of
$pkg in Makefile.rules | a2ps
$sql .= " cl_package_class TEXT,\n"; #
CORE|BASE|PLUS|EVAL|JUNK | CORE
$sql .= "PRIMARY KEY ( cl_package_name ) ON CONFLICT REPLACE\n";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-ui.pl
============================================================================
$ cvs diff -u -r1.2 -r1.3 bf-ui.pl
--- openpkg-tools/cmd/bf-ui.pl 26 Jan 2005 13:59:37 -0000 1.2
+++ openpkg-tools/cmd/bf-ui.pl 26 Jan 2005 14:03:52 -0000 1.3
@@ -711,11 +711,11 @@
my $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile", "", "", { RaiseError
=> 0, AutoCommit => 1 });
if (not defined $dbh) { die "$0: \"cannot open database file
\"$dbfile\"\n"; }
- my $tables = $dbh->selectall_hashref("SELECT name FROM sqlite_master
WHERE type='table' ORDER BY name;", "name");
+ my $tables = $dbh->selectall_hashref("SELECT name FROM sqlite_master
WHERE type='table' ORDER BY name;", "name");
- unless ($tables->{status}) { die "$0: \"status\" table missing in
database file \"$dbfile\"\n"; }
- unless ($tables->{processing}) { die "$0: \"processing\" table missing
in database file \"$dbfile\"\n"; }
- unless ($tables->{class}) { die "$0: \"class\" table missing in
database file \"$dbfile\"\n"; }
+ unless ($tables->{status}) { die "$0: \"status\" table missing in
database file \"$dbfile\"\n"; }
+ unless ($tables->{processing}) { die "$0: \"processing\" table missing
in database file \"$dbfile\"\n"; }
+ unless ($tables->{class}) { die "$0: \"class\" table missing in
database file \"$dbfile\"\n"; }
return $dbh;
}
@@ -733,7 +733,7 @@
my $i = -1;
$hint = join("", map { s/^/sprintf("%d: ", $line+$i++)/se; $_; }
@code[$line-2..$line]);
}
- print STDOUT
+ print STDOUT
"Content-Type: text/html; charset=ISO-8859-1\n" .
"\n" .
"<html>\n" .
@@ -833,7 +833,7 @@
[-H|help] print out this usage page
[-V|verbose] enable verbose run-time mode
-Accessible through
+Accessible through
http://127.0.0.1/openpkg-cgi/openpkg-tools/bf-ui.cgi
after master initialization has been run, see "openpkg bf-mk".
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/build.pl
============================================================================
$ cvs diff -u -r1.9 -r1.10 build.pl
--- openpkg-tools/cmd/build.pl 8 Jan 2005 09:09:55 -0000 1.9
+++ openpkg-tools/cmd/build.pl 26 Jan 2005 14:03:52 -0000 1.10
@@ -658,7 +658,7 @@
@l = run("$RPM -q --provides -p $fn");
} else {
@l = run("$RPM -q --provides $t->{name}");
- }
+ }
$opt = parse_provideslist([EMAIL PROTECTED]);
if (scalar(keys %$opt) == 0) {
if (defined $fn) {
@@ -997,7 +997,7 @@
@$_;
} grep {
!exists $_->{'cond'}
- } @{$_->{'Provides'}};
+ } @{$_->{'Provides'}};
}
@provides = map {
@@ -1560,7 +1560,7 @@
}
#
-# report options that are not used for
+# report options that are not used for
#
sub warn_about_options ($$$) {
my($target, $with, $c) = @_;
@@ -1610,7 +1610,7 @@
}
return 0 if $conflict;
-
+
print "# ",vsn($target)," adds option $opt = $val\n";
$with->{$opt} = $val;
return 1;
@@ -1814,7 +1814,7 @@
}
next;
}
-
+
unless (depend_option($t, $d{$_}, $env)) {
push @$clist, $target;
pusherr($env,$target,"$target->{name} has conflicting
requirement");
@@ -2185,7 +2185,7 @@
}
$bpkg = target2rpm($_, $c);
- $mywith =
+ $mywith =
#
# rebuild binary package IF
@@ -2292,7 +2292,7 @@
status => $_->{STATUS}
};
}
-
+
foreach (@$bonly) {
next unless $_->{release} =~ /\S/;
$map{$_->{name}} = {
@@ -2478,13 +2478,13 @@
=head1 SYNOPSIS
-B<openpkg>
-B<build>
+B<openpkg>
+B<build>
[B<-R> I<rpm>]
[B<-r> I<repository>]
[B<-f> I<index.rdf>]
-[B<-u>]
-[B<-U>]
+[B<-u>]
+[B<-U>]
[B<-z>]
[B<-Z>]
[B<-i>]
@@ -2569,7 +2569,7 @@
=item B<-Z>
B<openpkg build> ignores all installed packages, the
-script will rebuild all selected packages from scratch.
+script will rebuild all selected packages from scratch.
Note that this doesn't work together with the B<-a> option.
=item B<-i>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/index.pl
============================================================================
$ cvs diff -u -r1.3 -r1.4 index.pl
--- openpkg-tools/cmd/index.pl 8 Jun 2004 20:26:23 -0000 1.3
+++ openpkg-tools/cmd/index.pl 26 Jan 2005 14:03:52 -0000 1.4
@@ -97,7 +97,7 @@
resource => $1,
attrname => $attrname{$2},
attrval => $3
- }
+ }
}
return {
@@ -354,9 +354,9 @@
}
} elsif ($v =~ /^\#NoSource\s*(.*?)\s*$/) {
- #
- # store conditional NoSource attribute
- #
+ #
+ # store conditional NoSource attribute
+ #
push @{$attr{'NoSource'}->{$cond}}, commasep('NoSource',$1);
} elsif ($v =~ /^\s*([^\#]\S*)\s*:\s*(.*?)\s*$/) {
@@ -487,7 +487,7 @@
join("\n", map { e($_) } @{$a->{$k}->{$cond}}).
"</$tag>\n";
}
-
+
return $out;
}
@@ -575,7 +575,7 @@
}
}
if ($maj > 1 || ($maj == 1 && $min >= 0)) {
- # 1.0 or later
+ # 1.0 or later
if ($rel > 0) {
$href = 'UPD/'.$href;
}
@@ -585,7 +585,7 @@
}
}
-
+
print $fh <<EOFEOF;
<rdf:Description about="$about" href="$href">
EOFEOF
@@ -1008,14 +1008,14 @@
=head1 SYNOPSIS
-B<openpkg>
-B<index>
-[B<-r> I<resource>]
+B<openpkg>
+B<index>
+[B<-r> I<resource>]
[B<-p> I<platform>]
-[B<-C> I<cache.db>]
-[B<-o> I<index.rdf>]
-[B<-c>]
-[B<-i>]
+[B<-C> I<cache.db>]
+[B<-o> I<index.rdf>]
+[B<-c>]
+[B<-i>]
I<dir> ...
=head1 DESCRIPTION
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/src2make.pl
============================================================================
$ cvs diff -u -r1.2 -r1.3 src2make.pl
--- openpkg-tools/cmd/src2make.pl 24 Jan 2005 15:37:51 -0000 1.2
+++ openpkg-tools/cmd/src2make.pl 26 Jan 2005 14:03:52 -0000 1.3
@@ -190,7 +190,7 @@
# parse source RPM filename into components
my ($srcrpm_name, $srcrpm_version, $srcrpm_release);
- if (not (($srcrpm_name, $srcrpm_version, $srcrpm_release) =
+ if (not (($srcrpm_name, $srcrpm_version, $srcrpm_release) =
($srcrpm =~
m/^(.+?)-([^-]+)-(\d+\.\d+\.\d+|\d+\.\d{8}|\d{8})\.src\.rpm$/))) {
die "malformed source RPM filename '$srcrpm'";
}
@@ -235,12 +235,12 @@
# (because RPM has only single REQUIRE queries and applied to
# source RPMs they return the BuildPreReq and applied to the .spec
# they act as applied on a binary RPM and return the PreReq)
- #
+ #
# getting the spec through rpm2cpio is a very expensive operation
# in terms of IO and CPU burning. To avoid repetitive execution of
# this command the spec file is cached, speeding up the next run
# at the price of some hundret kilobytes disk space.
-
+
# read the cache (if any) and check whether it matches the src.rpm
# we work on. Becaues the OpenPKG naming scheme for CURRENT is
# build upon YYYYMMDD information it allows different packages
@@ -338,9 +338,9 @@
$DGB->{"$srcrpm_name-$srcrpm_version-$srcrpm_release"} = $pkg_breq;
$DGI->{"$srcrpm_name-$srcrpm_version-$srcrpm_release"} = $pkg_ireq;
- # remember all provides of current package
+ # remember all provides of current package
# virtual1 ->+ this, ..., virtualN ->+ this
- foreach my $prov (@{$pkg_prov}) {
+ foreach my $prov (@{$pkg_prov}) {
$prov =~ s|\s+\S+\s+\S+\s*$||s;
$prov =~ s|\s+.*$||s;
$PGV->{$prov} = [] if (not defined($PGV->{$prov}));
@@ -386,7 +386,7 @@
else {
sub dumphash {
my ($n, $h) = @_;
- my $o;
+ my $o;
$o = Data::Dumper::Dumper($h);
$o =~ s|^\s*\$VAR1|\$$n|s;
return $o;
@@ -434,7 +434,7 @@
# generate standard header
sub hdr {
my ($line) = @_;
- my $hdr =
+ my $hdr =
"##\n" .
"## OpenPKG make(1) build specification for building/installing
packages\n" .
"## ATTENTION: DO NOT EDIT THIS FILE, IT WAS AUTO-GENERATED BY
$progname!\n" .
@@ -492,7 +492,7 @@
"MAKE_TRANS = MAKEFLAGS=\"\" \$(MAKE) \$(MFLAGS) -f Makefile.rules
\\\n" .
" HOSTNAME=\"\$(HOSTNAME)\" PLATFORM=\"\$(PLATFORM)\"
\\\n" .
" SSH_AUTH_SOCK=\"\$\$SSH_AUTH_SOCK\" \\\n" .
- " TERM_B=\"\$(TERM_B)\" TERM_N=\"\$(TERM_N)\" \\\n" .
+ " TERM_B=\"\$(TERM_B)\" TERM_N=\"\$(TERM_N)\" \\\n" .
" LOG=\"\$(LOG)\" SRC=\"\$(SRC)\" DST=\"\$(DST)\"
TMP=\"\$(TMP)\"\\\n" .
" RPM=\"\$(RPM)\" RPM_FLAGS=\"\$(RPM_FLAGS)\" \\\n" .
" EXEC_ROOT=\"\$(EXEC_ROOT)\"
EXEC_USER=\"\$(EXEC_USER)\"\\\n" .
@@ -671,7 +671,7 @@
# generate build entry for a single package
foreach my $pkg (sort(keys(%{$DGB}))) {
- my ($pkg_name, $pkg_version, $pkg_release) =
+ my ($pkg_name, $pkg_version, $pkg_release) =
($pkg =~ m/^(.+?)-([^-]+)-(\d+\.\d+\.\d+|\d+\.\d{8}|\d{8})$/);
$MF .= "# build: $pkg\n";
@@ -727,10 +727,10 @@
# generate install/uninstall entries for a single package
foreach my $pkg (sort(keys(%{$DGI}))) {
- my ($pkg_name, $pkg_version, $pkg_release) =
+ my ($pkg_name, $pkg_version, $pkg_release) =
($pkg =~ m/^(.+?)-([^-]+)-(\d+\.\d+\.\d+|\d+\.\d{8}|\d{8})$/);
- # generate install target
+ # generate install target
$MF .= "# install: $pkg\n";
$MF .= "install-$pkg: build-$pkg\n";
push(@MFTL, "install-$pkg");
@@ -750,7 +750,7 @@
$MF .= "\n";
- # generate uninstall target
+ # generate uninstall target
$MF .= "# uninstall: $pkg\n";
$MF .= "uninstall-$pkg:\n";
push(@MFTL, "uninstall-$pkg");
@@ -858,7 +858,7 @@
"\t TERM_N=`awk 'BEGIN { printf(\"%c%c%c%c%c\", 27, 91, 109,
0, 0); }' </dev/null 2>/dev/null` \\\n" .
"\t ;; \\\n" .
"\tesac; \\\n" .
- "\tumask 022; \\\n" .
+ "\tumask 022; \\\n" .
"\tif [ ! -d \$(TMP) ]; then \\\n" .
"\t mkdir \$(TMP); \\\n" .
"\tfi; \\\n" .
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
