@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
## Created on: 17 -Sep-2003
## Created on: 18 -Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@ -876,10 +876,14 @@ Index: lib/rpmrc.c
| A d d i t i o n a l l y , d o n o t o v e r r i d e t h e " _ h o s t _ x x " m a c r o s b e c a u s e t h e i r
| v a l u e ( d e r i v e d f r o m <prefix> / e t c / o p e n p k g / p l a t f o r m ) i s a l r e a d y
| c o r r e c t l y s e t i n t e r n a l l y .
| F i n a l l y , p r o v i d e d e f a u l t f o r i n t r o d u c e d v a r i a b l e
| % { _ f o r c e _ o l d p a c k a g e } , w h i c h , i f n o n - z e r o , a u t o m a t i c a l l y e n f o r c e s
| - - o l d p a c k a g e o n a l l u p g r a d e o p e r a t i o n s ( t h i s i s u s e f u l o n
| m a s s - u p g r a d e s f r o m O p e n P K G - C U R R E N T t o O p e n P K G - R E L E A S E ) .
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I n d e x : m a c r o s . i n
- - - m a c r o s . i n 2 J u l 2003 19 : 20 : 52 - 0000 1.1 .1 .14
+ + + m a c r o s . i n 15 S e p 2003 19 : 08 : 46 - 0000
+ + + m a c r o s . i n 18 S e p 2003 11 : 15 : 49 - 0000
@ @ - 305 , 7 + 305 , 7 @ @
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
#
@ -889,7 +893,18 @@ Index: macros.in
#
# Should unpackaged files in a build root terminate a build?
@ @ - 929 , 11 + 929 , 11 @ @
@ @ - 618 , 6 + 618 , 10 @ @
# If non-zero, all erasures will be automagically repackaged.
% _ r e p a c k a g e _ a l l _ e r a s u r e s 0
+ # If non-zero, automatically enforce --oldpackage for all upgrade operations
+ # (useful on mass-upgrades from OpenPKG-CURRENT to OpenPKG-RELEASE)
+ % _ f o r c e _ o l d p a c k a g e 0
+
# Verify digest/signature flags for various rpm modes:
# 1 --nohdrchk if set, don't check rpmdb headers
#
@ @ - 929 , 11 + 933 , 11 @ @
% _ b u i l d _ c p u % { _ h o s t _ c p u }
% _ b u i l d _ v e n d o r % { _ h o s t _ v e n d o r }
% _ b u i l d _ o s % { _ h o s t _ o s }
@ -1235,7 +1250,7 @@ Index: rpmqv.c
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I n d e x : d b / e n v / e n v _ r e g i o n . c
- - - d b / e n v / e n v _ r e g i o n . c 18 J a n 2003 14 : 05 : 01 - 0000 1.1 .1 .5
+ + + d b / e n v / e n v _ r e g i o n . c 17 S e p 2003 14 : 12 : 0 2 - 0000
+ + + d b / e n v / e n v _ r e g i o n . c 17 S e p 2003 17 : 58 : 1 2 - 0000
@ @ - 184 , 6 + 184 , 24 @ @
}
@ -1252,7 +1267,7 @@ Index: db/env/env_region.c
+ i f ( F _ I S S E T ( d b e n v , D B _ E N V _ C R E A T E ) )
+ g o t o c r e a t i o n ;
+ e l s e {
+ r e t = E N O E N T ;
+ r e t = E N O E N T ;
+ g o t o e r r ;
+ }
+ }
@ -1284,3 +1299,24 @@ Index: rpmdb/db3.c
/ * . . . n o n - e x i s t e n t ( o r u n w r i t a b l e ) D B E N V , w i l l c r e a t e . . . * /
d b i - > d b i _ o e f l a g s | = D B _ C R E A T E ;
d b i - > d b i _ e f l a g s & = ~ D B _ J O I N E N V ;
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| A d d i n t e r n a l f e a t u r e v a r i a b l e % { _ f o r c e _ o l d p a c k a g e } w h i c h , i f
| n o n - z e r o , a u t o m a t i c a l l y e n f o r c e s - - o l d p a c k a g e o n a l l u p g r a d e
| o p e r a t i o n s ( t h i s i s u s e f u l o n m a s s - u p g r a d e s f r o m O p e n P K G - C U R R E N T t o
| O p e n P K G - R E L E A S E ) .
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I n d e x : r p m . c
- - - r p m . c 16 M a y 2002 16 : 55 : 25 - 0000 1.1 .1 .23
+ + + r p m . c 18 S e p 2003 11 : 15 : 08 - 0000
@ @ - 1016 , 6 + 1016 , 10 @ @
i f ( o l d P a c k a g e & & ! u p g r a d e )
a r g e r r o r ( _ ( " - - o l d p a c k a g e m a y o n l y b e u s e d d u r i n g u p g r a d e s " ) ) ;
+ #ifdef OPENPKG
+ i f ( u p g r a d e & & r p m E x p a n d N u m e r i c ( " % { ? _ f o r c e _ o l d p a c k a g e } " ) )
+ p r o b F i l t e r | = R P M P R O B _ F I L T E R _ O L D P A C K A G E ;
+ #endif
i f ( n o P g p & & b i g M o d e ! = M O D E _ C H E C K S I G )
a r g e r r o r ( _ ( " - - n o p g p m a y o n l y b e u s e d d u r i n g s i g n a t u r e c h e c k i n g " ) ) ;
