RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 29-Apr-2012 23:19:16 Branch: rpm-5_4 Handle: 2012042921191600 Modified files: (Branch: rpm-5_4) rpm rpmqv.c Log: - c++: fix: revert some over-zealous changes. Summary: Revision Changes Path 1.167.4.8 +6 -27 rpm/rpmqv.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmqv.c ============================================================================ $ cvs diff -u -r1.167.4.7 -r1.167.4.8 rpmqv.c --- rpm/rpmqv.c 27 Apr 2012 19:13:48 -0000 1.167.4.7 +++ rpm/rpmqv.c 29 Apr 2012 21:19:16 -0000 1.167.4.8 @@ -938,23 +938,14 @@ #ifdef IAM_RPMEIU case MODE_ERASE: - ia->depFlags = (rpmdepFlags) global_depFlags; + ia->depFlags = global_depFlags; + if (ia->noDeps) ia->installInterfaceFlags |= INSTALL_NODEPS; if (!poptPeekArg(optCon)) { if (ia->rbtid == 0) argerror(_("no packages given for erase")); - -#ifdef __cplusplus - if (ia->noDeps) - *((unsigned *)&ia->installInterfaceFlags) |= INSTALL_NODEPS; -*((unsigned *)&ia->transFlags) |= RPMTRANS_FLAG_NOFDIGESTS; -*((unsigned *)&ia->probFilter) |= RPMPROB_FILTER_OLDPACKAGE; -#else - if (ia->noDeps) ia->installInterfaceFlags |= INSTALL_NODEPS; ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS; ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE; -#endif - ia->rbCheck = rpmcliInstallCheck; ia->rbOrder = rpmcliInstallOrder; ia->rbRun = rpmcliInstallRun; @@ -968,18 +959,16 @@ /* RPMTRANS_FLAG_KEEPOBSOLETE */ - ia->depFlags = (rpmdepFlags) global_depFlags; + ia->depFlags = global_depFlags; if (!ia->incldocs) { if (ia->transFlags & RPMTRANS_FLAG_NODOCS) { ; } else if (rpmExpandNumeric("%{_excludedocs}")) -#ifdef __cplusplus - *((unsigned *)&ia->transFlags) |= RPMTRANS_FLAG_NODOCS; -#else ia->transFlags |= RPMTRANS_FLAG_NODOCS; -#endif } + if (ia->noDeps) ia->installInterfaceFlags |= INSTALL_NODEPS; + /* we've already ensured !(!ia->prefix && !ia->relocations) */ /*@-branchstate@*/ if (ia->qva_prefix) { @@ -996,18 +985,8 @@ if (!poptPeekArg(optCon)) { if (ia->rbtid == 0) argerror(_("no packages given for install")); - -#ifdef __cplusplus - if (ia->noDeps) - *((unsigned *)&ia->installInterfaceFlags) |= INSTALL_NODEPS; -*((unsigned *)&ia->transFlags) |= RPMTRANS_FLAG_NOFDIGESTS; -*((unsigned *)&ia->probFilter) |= RPMPROB_FILTER_OLDPACKAGE; -#else - if (ia->noDeps) ia->installInterfaceFlags |= INSTALL_NODEPS; ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS; ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE; -#endif - ia->rbCheck = rpmcliInstallCheck; ia->rbOrder = rpmcliInstallOrder; ia->rbRun = rpmcliInstallRun; @@ -1034,7 +1013,7 @@ break; case MODE_VERIFY: - { rpmVerifyFlags vflags = (rpmVerifyFlags) VERIFY_ALL; + { rpmVerifyFlags vflags = (rpmVerifyFlags) ~RPMVERIFY_NONE; qva->depFlags = (rpmdepFlags) global_depFlags; #ifdef __cplusplus @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org