diff options
| author | tv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c> | 2012-06-26 18:14:29 +0000 |
|---|---|---|
| committer | tv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c> | 2012-06-26 18:14:29 +0000 |
| commit | 29ae139099abfa1f56109af3541866e95026ad16 (patch) | |
| tree | d84832bcd8826b25921be7105684311baacfd37a | |
| parent | ed09a3291648bc2b9c97fe8e27d9777a0fba1d75 (diff) | |
| download | perl-RPM4-29ae139099abfa1f56109af3541866e95026ad16.tar perl-RPM4-29ae139099abfa1f56109af3541866e95026ad16.tar.gz perl-RPM4-29ae139099abfa1f56109af3541866e95026ad16.tar.bz2 perl-RPM4-29ae139099abfa1f56109af3541866e95026ad16.tar.xz perl-RPM4-29ae139099abfa1f56109af3541866e95026ad16.zip | |
revert commit r213 from Jun 20 2012 ("(srcrpm) simplify"), thus fixing
srcrpm() until panu merges my patch
git-svn-id: svn+ssh://haiku.zarb.org/home/projects/rpm4/svn/trunk@222 971eb68f-4bfb-0310-8326-d2484c010a4c
| -rw-r--r-- | RPM4/NEWS | 2 | ||||
| -rw-r--r-- | RPM4/src/RPM4.xs | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- fix srcrpm() + Version 0.31 - 25 June 2012 - drop rpm5 functions: rpmsysinfodep, rpmgetconfdep, rpmcpuinfodep, rpmpipedep diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs index ca7b902..a2002ea 100644 --- a/RPM4/src/RPM4.xs +++ b/RPM4/src/RPM4.xs @@ -2655,7 +2655,8 @@ Spec_srcrpm(spec) #else header = spec->packages->header; #endif - int no_src = !headerIsEntry(header, RPMTAG_SOURCERPM); + struct rpmtd_s td; + int no_src = headerGet(header, RPMTAG_NOPATCH, &td, HEADERGET_MINMEM) || headerGet(header, RPMTAG_NOSOURCE, &td, HEADERGET_MINMEM); char *nvr = headerGetAsString(header, RPMTAG_NVR); mXPUSHs(newSVpvf("%s/%s.%ssrc.rpm", rpmGetPath("%{_srcrpmdir}", NULL), |