aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-12-11 20:54:35 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-12-11 20:54:35 +0000
commitd87deeafc867b0e3c2320285bc97c068481ca104 (patch)
tree40dd9882d98b0e1ae5a2e93bc42a1e5b49a73c18
parentc4c3364ad8d441a620bbe81962e9a51b8da94f5e (diff)
downloadperl-URPM-d87deeafc867b0e3c2320285bc97c068481ca104.tar
perl-URPM-d87deeafc867b0e3c2320285bc97c068481ca104.tar.gz
perl-URPM-d87deeafc867b0e3c2320285bc97c068481ca104.tar.bz2
perl-URPM-d87deeafc867b0e3c2320285bc97c068481ca104.tar.xz
perl-URPM-d87deeafc867b0e3c2320285bc97c068481ca104.zip
in case of missing distepoch & disttag, return empty string in stead of NULL for synthesis to get consistent behaviour with querying rpm headers
-rw-r--r--URPM.xs4
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM.xs b/URPM.xs
index 47f3fe5..3e8dfda 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -310,7 +310,7 @@ get_fullname_parts(URPM__Package pkg, char **name, int *epoch, char **version, c
}
}
}
- if (distepoch != NULL) *distepoch = _distepoch ? _distepoch+1 : NULL;
+ if (distepoch != NULL) *distepoch = _distepoch ? _distepoch+1 : "";
if (disttag != NULL || release != NULL || version != NULL || name != NULL) {
if (_disttag == NULL) {
/* XXX: re-verify this logic, see comment above.. */
@@ -318,7 +318,7 @@ get_fullname_parts(URPM__Package pkg, char **name, int *epoch, char **version, c
backup_char(_disttag);
} else _disttag = NULL;
}
- if (disttag != NULL) *disttag = _disttag ? _disttag + 1: NULL;
+ if (disttag != NULL) *disttag = _disttag ? _disttag + 1: "";
if ((release != NULL || version != NULL || name != NULL) && (_release = strrchr(pkg->info, '-')) != NULL) {
backup_char(_release);
if (release != NULL) *release = _release + 1;