RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 30-May-2012 21:17:04 Branch: rpm-5_4 Handle: 2012053019170400 Modified files: (Branch: rpm-5_4) rpm/macros macros.in Log: - rpmevr: re-align the comments and use EVTRD instead of X (in comments). Summary: Revision Changes Path 1.39.2.36 +16 -16 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.39.2.35 -r1.39.2.36 macros.in --- rpm/macros/macros.in 30 May 2012 18:15:58 -0000 1.39.2.35 +++ rpm/macros/macros.in 30 May 2012 19:17:04 -0000 1.39.2.36 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.35 2012/05/30 18:15:58 jbj Exp $ +# $Id: macros.in,v 1.39.2.36 2012/05/30 19:17:04 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -739,12 +739,12 @@ # (configuration without twiddle-in-version) # STEP 1: Match the string and capture regex parts # 1 2 3 4 -# X ":" X "-"X ":"X +# E ":" V "-"R ":"D #%evr_tuple_match ^(?:([^:-]+):)?([^:-]+)(?:-([^:-]+))?(?::([^:-]+))?$ # STEP 2: Assemble <E,V,R,D> tuple from regex parts # <E,V,R,D> case 1: case 2: case 3: case 4: case 5: case 6: -# X:X-X:X X:X-X X:X X: X-X X +# E:V-R:D E:V-R E:V E: V-R V # %evr_tuple_select 1234 123_ 12__ 1___ _23_ _2__ #%evr_tuple_select 123_ @@ -753,22 +753,22 @@ # (configuration with twiddle-in-version) # STEP 1: Match the string and capture regex parts -# 1 2 3 4 5 -# X ":" X "~"X "-"X ":"X +# 1 2 3 4 5 +# E ":" V "~"T "-"R ":"D %evr_tuple_match ^(?:([^:-]+):)?([^:~-]+)(?:~([^:-]+))?(?:-([^:-]+))?(?::([^:-]+))?$ # STEP 2: Assemble <E,V,T,R,D> tuple from regex parts (11 cases) -# X:X~X-X:X 12345 -# X:X-X:X 12_45 -# X:X~X-X 1234_ -# X:X-X 12_4_ -# X:X~X 123__ -# X:X 12___ -# X: 1____ -# X~X-X _234_ -# X-X _2_4_ -# X~X _23__ -# X _2___ +# E:V~T-R:D 12345 +# E:V-R:D 12_45 +# E:V~T-R 1234_ +# E:V-R 12_4_ +# E:V~T 123__ +# E:V 12___ +# E: 1____ +# V~T-R _234_ +# V-R _2_4_ +# V~T _23__ +# V _2___ %evr_tuple_select 12_4_ # STEP 3: Configure the comparison order of the <E,V,T,R,D> tuple elements @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
