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

List:       rpm-devel
Subject:    Re: [CVS] RPM: rpm/lib/ psm.c
From:       Jeff Johnson <n3npq () mac ! com>
Date:       2009-07-07 22:04:48
Message-ID: 05A97A4F-1972-4070-8AD5-8292B0D7432D () mac ! com
[Download RAW message or body]

Hmmm, there's got to be an easier way to do a lazy Chown() call
than passing around an rpmfi to carry the uid/gid.

Maybe rpmbuild --verify to check/instantiate/fix all build elements,
with -v added to display all config files that are actually present.

73 de Jeff

On Jul 7, 2009, at 5:10 PM, Ralf S. Engelschall wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>   
> ____________________________________________________________________________
>
>  Server: rpm5.org                         Name:   Ralf S. Engelschall
>  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>  Module: rpm                              Date:   07-Jul-2009 23:10:14
>  Branch: HEAD                             Handle: 2009070721101400
>
>  Modified files:
>    rpm/lib                 psm.c
>
>  Log:
>    fix building under
>    RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install
>
>  Summary:
>    Revision    Changes     Path
>    2.376       +13 -0      rpm/lib/psm.c
>   
> ____________________________________________________________________________
>
>  patch -p0 <<'@@ .'
>  Index: rpm/lib/psm.c
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.375 -r2.376 psm.c
>  --- rpm/lib/psm.c	18 Jun 2009 21:31:41 -0000	2.375
>  +++ rpm/lib/psm.c	7 Jul 2009 21:10:14 -0000	2.376
>  @@ -154,7 +154,11 @@
>       return RPMRC_OK;
>   }
>
>  +#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on- 
> srpm-install */
>  +static rpmRC createDir(rpmfi fi, rpmts ts, const char ** fn, const  
> char * name)
>  +#else
>   static rpmRC createDir(rpmts ts, const char ** fn, const char *  
> name)
>  +#endif
>   	/*@globals rpmGlobalMacroContext @*/
>   	/*@modifies *fn, rpmGlobalMacroContext @*/
>   {
>  @@ -325,12 +329,21 @@
>   	}
>       }
>
>  +#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on- 
> srpm-install */
>  +    if(createDir(fi, ts, NULL, "%{_topdir}") ||
>  +	    createDir(fi, ts, NULL, "%{_builddir}") ||
>  +	    createDir(fi, ts, NULL, "%{_rpmdir}") ||
>  +	    createDir(fi, ts, NULL, "%{_srcrpmdir}") ||
>  +	    createDir(fi, ts, &_sourcedir, "%{_sourcedir}") ||
>  +	    createDir(fi, ts, &_specdir, "%{_specdir}"))
>  +#else
>       if(createDir(ts, NULL, "%{_topdir}") ||
>   	    createDir(ts, NULL, "%{_builddir}") ||
>   	    createDir(ts, NULL, "%{_rpmdir}") ||
>   	    createDir(ts, NULL, "%{_srcrpmdir}") ||
>   	    createDir(ts, &_sourcedir, "%{_sourcedir}") ||
>   	    createDir(ts, &_specdir, "%{_specdir}"))
>  +#endif
>   	goto exit;
>
>       /* Build dnl/dil with {_sourcedir, _specdir} as values. */
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org

______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
Developer Communication List                        rpm-devel@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]