OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   28-Feb-2003 15:22:11
  Branch: HEAD                             Handle: 2003022814220504

  Modified files:
    openpkg-src/openpkg-tool
                            openpkg-index.pl openpkg-tool.spec openpkg.1
                            openpkg.pod
    openpkg-web             news.txt

  Log:
    Document that the index cache requires an installed DB_File and
    produce a nice error message if it isn't.

  Summary:
    Revision    Changes     Path
    1.16        +6  -1      openpkg-src/openpkg-tool/openpkg-index.pl
    1.40        +2  -2      openpkg-src/openpkg-tool/openpkg-tool.spec
    1.5         +43 -12     openpkg-src/openpkg-tool/openpkg.1
    1.14        +2  -1      openpkg-src/openpkg-tool/openpkg.pod
    1.3486      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg-index.pl
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 openpkg-index.pl
  --- openpkg-src/openpkg-tool/openpkg-index.pl 12 Feb 2003 10:10:23 -0000      1.15
  +++ openpkg-src/openpkg-tool/openpkg-index.pl 28 Feb 2003 14:22:09 -0000      1.16
  @@ -939,7 +939,12 @@
   }
   
   if ($opt_C) {
  -    require DB_File;
  +    eval {
  +        require DB_File;
  +    };
  +    if ($@) {
  +        die "Sorry. The -C option requires an installed DB_File perl module.\n";
  +    }
       tie %cache, 'DB_File', $opt_C, O_CREAT|O_RDWR, 0666, $DB_File::DB_HASH
           or die "FATAL: cannot tie cache '$opt_C' ($!)\n";
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg-tool.spec
  ============================================================================
  $ cvs diff -u -r1.39 -r1.40 openpkg-tool.spec
  --- openpkg-src/openpkg-tool/openpkg-tool.spec        20 Feb 2003 09:24:28 -0000     
 1.39
  +++ openpkg-src/openpkg-tool/openpkg-tool.spec        28 Feb 2003 14:22:09 -0000     
 1.40
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [PLUS]
   Group:        Bootstrapping
   License:      GPL
  -Version:      20030220
  -Release:      20030220
  +Version:      20030228
  +Release:      20030228
   
   #   list of sources
   Source0:      openpkg.sh
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg.1
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 openpkg.1
  --- openpkg-src/openpkg-tool/openpkg.1        14 Jan 2003 20:39:00 -0000      1.4
  +++ openpkg-src/openpkg-tool/openpkg.1        28 Feb 2003 14:22:09 -0000      1.5
  @@ -129,7 +129,7 @@
   .\" ========================================================================
   .\"
   .IX Title "OPENPKG 1"
  -.TH OPENPKG 1 "2003-01-13" "openpkg-tool" "OpenPKG Maintainance"
  +.TH OPENPKG 1 "2003-02-28" "openpkg-tool" "OpenPKG Maintainance"
   .SH "NAME"
   \&\fBopenpkg\fR \- \fBOpenPKG\fR maintainance utility
   .SH "VERSION"
  @@ -161,7 +161,11 @@
   [\fB\-s\fR]
   [\fB\-S\fR]
   [\fB\-M\fR]
  +[\fB\-L\fR]
  +[\fB\-W\fR]
   [\fB\-X\fR]
  +[\fB\-K\fR]
  +[\fB\-e\fR]
   [\fB\-P\fR \fIpriv-cmd\fR]
   [\fB\-N\fR \fInon-priv-cmd\fR]
   [\fB\-p\fR \fIplatform\fR]
  @@ -190,17 +194,15 @@
   "\f(CW\*(C`OpenPKG\-CURRENT/Source/\*(C'\fR".
   .IP "\fB\-p\fR \fIplatform\fR" 4
   .IX Item "-p platform"
  -\&\fBopenpkg index\fR adds a platform attribute for binary RPMs. The
  -attribute is built as 
\fI%{arch}\fR\f(CW\*(C`\-\*(C'\fR\fIplatform\fR\f(CW\*(C`\-\*(C'\fR\fI%{os}\fR where
  -\&\fI%{arch}\fR and \fI%{os}\fR are taken from the \s-1RPM\s0 header and 
\fIplatform\fR is
  -the value of the \fB\-p\fR option. The default value is 
"\f(CW\*(C`unknown\*(C'\fR". This
  -must be used to distinguish between platforms that support the same
  -Architecture and \s-1OS\s0 name like various Linux distributions.
  +\&\fBopenpkg index\fR adds a platform attribute for binary RPMs. This
  +must be unique to correctly identify a specific architecture, \s-1OS\s0
  +and build environment.
   .IP "\fB\-C\fR \fIcache.db\fR" 4
   .IX Item "-C cache.db"
   Cache all \fI.spec\fR files into this Berkeley-DB file when indexing source
   RPMs. The cache is refreshed automatically when the source RPMs are more
  -recent than the cache entry.
  +recent than the cache entry. The \fB\-C\fR option requires an installed
  +DB_File perl module.
   .IP "\fB\-o\fR \fIindex.rdf\fR" 4
   .IX Item "-o index.rdf"
   Name of the output \s-1XML/RDF\s0 file, default is to write to \fIstdout\fR.
  @@ -226,6 +228,12 @@
   on the upgraded package (\*(L"reverse dependencies\*(R"). The dependency
   information is read from an index generated by \fBopenpkg index\fR.
   .PP
  +Packages are selected by providing a list of name patterns. Each
  +pattern is either a package name or a prefix followed by a '*'
  +character. Additionally you can append a discrimation prefix separated
  +by a comma that matches against the full name-version-revision
  +string.
  +.PP
   The following command line options exist:
   .IP "\fB\-R\fR \fIrpm\fR" 4
   .IX Item "-R rpm"
  @@ -320,22 +328,45 @@
   .IP "\fB\-M\fR" 4
   .IX Item "-M"
   Similar to \fB\-s\fR but print a short dependency map.
  +.IP "\fB\-L\fR" 4
  +.IX Item "-L"
  +Print a list of packages in the repository that depend on the target.
  +.IP "\fB\-W\fR" 4
  +.IX Item "-W"
  +Include all conditional dependencies as if all possible configuration
  +options had been switched on. This has little use except for generating
  +an all-inclusive list with the \fB\-L\fR option.
  +\&\fI\s-1ATTENTION:\s0 Even mutually exclusive options are evaluated to be 'on',
  +building packages with \f(BI\-W\fI therefore might fail or cause unusuable
  +results!\fR
   .IP "\fB\-X\fR" 4
   .IX Item "-X"
   Ignore an installed \s-1XML\s0 parser module but use the internal
   simple text parser instead.
  +.IP "\fB\-K\fR" 4
  +.IX Item "-K"
  +Keep packages that were installed temporarily during the build process.
  +.IP "\fB\-e\fR" 4
  +.IX Item "-e"
  +Rebuild exact version from repository even when you have installed
  +a newer version from another repository.
   .IP "\fB\-P\fR \fIpriv-cmd\fR" 4
   .IX Item "-P priv-cmd"
   Command prefix to use for install commands that require elevated
  -privileges. The most common tool for this is \fIsudo\fR\|(8).
  +privileges. The most common tool for this is \fIsudo\fR\|(8). If \fIpriv-cmd\fR
  +starts with a dash it will be run without the dash and the command
  +line it should execute is passed as a single quoted string.
   .IP "\fB\-N\fR \fInon-priv-cmd\fR" 4
   .IX Item "-N non-priv-cmd"
   Command prefix to use for install commands that do not require elevated
  -privileges. The most common tool for this is \fIsudo\fR\|(8).
  +privileges. The most common tool for this is \fIsudo\fR\|(8). If \fIpriv-cmd\fR
  +starts with a dash it will be run without the dash and the command
  +line it should execute is passed as a single quoted string.
   .IP "\fB\-p\fR \fIplatform\fR" 4
   .IX Item "-p platform"
   The platform string that is matched against the index for binary
  -packages. Default is to use the \fI%{_target_platform}\fR variable.
  +packages. Default is an empty string so that no binary packages
  +are matched.
   .IP "\fB\-D\fR\fIvar\fR=\fIval\fR" 4
   .IX Item "-Dvar=val"
   Specify configuration options for all selected packages. This can be
  @@ -356,7 +387,7 @@
   .IP "\fB\-A\fR" 4
   .IX Item "-A"
   Select all packages in the repository. Do not specify a pattern list together
  -with the \fB\-a\fR option.
  +with the \fB\-A\fR option.
   .SH "CONFIGURATION"
   .IX Header "CONFIGURATION"
   \&\fBopenpkg build\fR reads the configuration file \fI$HOME/.openpkg/build\fR.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg.pod
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 openpkg.pod
  --- openpkg-src/openpkg-tool/openpkg.pod      18 Feb 2003 16:20:36 -0000      1.13
  +++ openpkg-src/openpkg-tool/openpkg.pod      28 Feb 2003 14:22:09 -0000      1.14
  @@ -107,7 +107,8 @@
   
   Cache all F<.spec> files into this Berkeley-DB file when indexing source
   RPMs. The cache is refreshed automatically when the source RPMs are more
  -recent than the cache entry.
  +recent than the cache entry. The B<-C> option requires an installed
  +DB_File perl module.
   
   =item B<-o> I<index.rdf>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3485 -r1.3486 news.txt
  --- openpkg-web/news.txt      27 Feb 2003 21:05:21 -0000      1.3485
  +++ openpkg-web/news.txt      28 Feb 2003 14:22:05 -0000      1.3486
  @@ -1,3 +1,4 @@
  +28-Feb-2003: Upgraded package: P<openpkg-tool-20030228-20030228>
   27-Feb-2003: New package: P<nsd-1.0.2-20030227>
   27-Feb-2003: Upgraded package: P<mysql4-4.0.11a-20030227>
   27-Feb-2003: Upgraded package: P<unixodbc-2.2.5-20030227>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to