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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re                       Date:   19-Mar-2003 22:56:24
  Branch: HEAD                             Handle: 2003031921562400

  Modified files:
    openpkg-re              openpkg-dev pmod-psod.txt

  Log:
    "list" using new $P$B$E semantics

  Summary:
    Revision    Changes     Path
    1.64        +14 -2      openpkg-re/openpkg-dev
    1.35        +5  -2      openpkg-re/pmod-psod.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/openpkg-dev
  ============================================================================
  $ cvs diff -u -r1.63 -r1.64 openpkg-dev
  --- openpkg-re/openpkg-dev    19 Mar 2003 21:39:49 -0000      1.63
  +++ openpkg-re/openpkg-dev    19 Mar 2003 21:56:24 -0000      1.64
  @@ -736,8 +736,20 @@
   }
   
   list () {
  -    ls -l ${OPENPKG_WORK}/pkg/src/$1*
  -    ls -l ${OPENPKG_WORK}/pkg/bin/$1*
  +    if [ ".$1" = . ]; then
  +        if [ ".$P" = . ]; then
  +            die "package cannot be identified. \$P might not be set properly."
  +        fi
  +        if [ ".$E" = . -o ! -x $E/bin/rpm ]; then
  +            die "$E/bin/rpm not executable. \$E might not be set properly."
  +        fi
  +        locationid=`$E/bin/rpm --eval %{_rpmfilename} | sed -e 's;^.*}-;;' -e 
's;\.rpm$;;'`
  +        ls -l ${OPENPKG_WORK}/pkg/src/$P* | egrep "/$P-[^-]+-[^-]+\.(no)?src.rpm$"
  +        ls -l ${OPENPKG_WORK}/pkg/bin/$P* | egrep 
"/$P-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$"
  +    else
  +        ls -l ${OPENPKG_WORK}/pkg/src/$1*
  +        ls -l ${OPENPKG_WORK}/pkg/bin/$1*
  +    fi
   }
   
   diff () {
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-re/pmod-psod.txt
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 pmod-psod.txt
  --- openpkg-re/pmod-psod.txt  12 Mar 2003 15:12:24 -0000      1.34
  +++ openpkg-re/pmod-psod.txt  19 Mar 2003 21:56:24 -0000      1.35
  @@ -150,9 +150,12 @@
       #OPTION2 removes all files from dst cache (required if vendor uses same 
filename for different releases)
   
   - list source and binary packages by executing the "list" function. The
  -  argument is optional and a asterix is added to it automatically.
  +  wildcard argument is optional and a asterix is added to it automatically.
  +  If the wildcard is omitted, $P will be taken and a more restrictive match
  +  to OpenPKG/RPM filename conventions will be used.
   
  -    openpkg-dev$ openpkg-dev list $P
  +    openpkg-dev$ openpkg-dev list
  +    openpkg-dev$ openpkg-dev list <wildcard>
   
   - diff before a release by executing the "diff" function. This is a
     "dry" run of the "release" function without altering anything.
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to