[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-re/ openpkg-dev
From:       "Thomas Lotterer" <thl () openpkg ! org>
Date:       2003-03-31 18:39:38
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  thl@openpkg.org
  Module: openpkg-re                       Date:   31-Mar-2003 20:39:38
  Branch: HEAD                             Handle: 2003033119393800

  Modified files:
    openpkg-re              openpkg-dev

  Log:
    modify logic to set P,B,E to detection when it conflicts with
    enforcment - the latter can then be used to reject a command on
    mismatch

  Summary:
    Revision    Changes     Path
    1.79        +3  -6      openpkg-re/openpkg-dev
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/openpkg-dev
  ============================================================================
  $ cvs diff -u -r1.78 -r1.79 openpkg-dev
  --- openpkg-re/openpkg-dev	31 Mar 2003 18:33:45 -0000	1.78
  +++ openpkg-re/openpkg-dev	31 Mar 2003 18:39:38 -0000	1.79
  @@ -575,10 +575,9 @@
                       CD_FUNC_PX="P=\${P}"
                       CD_FUNC_PD="P=\${P}."
                   else
  -                    # forced; detected and mismatch; print forced black ! detected \
normal (aka forced exclamation mark detected)  +                    # forced; \
detected and mismatch; keep detected; print forced black ! detected normal (aka \
                forced exclamation mark detected)
                       CD_FUNC_PX="P=\${OPENPKG_SPEC}!\${P}"
                       CD_FUNC_PD="P=\${OPENPKG_SPEC}.\${P}!"
  -                    P="\${OPENPKG_SPEC}"
                   fi
               fi
           fi
  @@ -607,10 +606,9 @@
                       CD_FUNC_BX="B=\${B}"
                       CD_FUNC_BD="B=\${B}."
                   else
  -                    # forced; detected and mismatch; print forced black ! detected \
normal (aka forced exclamation mark detected)  +                    # forced; \
detected and mismatch; keep detected; print forced black ! detected normal (aka \
                forced exclamation mark detected)
                       CD_FUNC_BX="B=\${OPENPKG_CTAG}!\${B}"
                       CD_FUNC_BD="B=\${OPENPKG_CTAG}.\${B}!"
  -                    B="\${OPENPKG_CTAG}"
                   fi
               fi
           fi
  @@ -639,10 +637,9 @@
                       CD_FUNC_EX="E=\${E}"
                       CD_FUNC_ED="E=\${E}."
                   else
  -                    # forced; detected and mismatch; print forced black ! detected \
normal (aka forced exclamation mark detected)  +                    # forced; \
detected and mismatch; keep detected; print forced black ! detected normal (aka \
                forced exclamation mark detected)
                       CD_FUNC_EX="E=\${OPENPKG_EXEC}!\${E}"
                       CD_FUNC_ED="E=\${OPENPKG_EXEC}.\${E}!"
  -                    E="\${OPENPKG_EXEC}"
                   fi
               fi
           fi
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]