summaryrefslogtreecommitdiffstats
path: root/perl-install/c
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-28 19:14:45 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-28 19:14:45 +0000
commit2ee22881483e84ea8b5ef0a5125631c04d174617 (patch)
tree049f83e2f8ef8c2ed3630d26b8a9f9c525202709 /perl-install/c
parent68db145d16c5fa22c876b294411cb9417ad3b08e (diff)
downloaddrakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.gz
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.bz2
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.xz
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.zip
no_comment
Diffstat (limited to 'perl-install/c')
-rw-r--r--perl-install/c/stuff.pm1
-rw-r--r--perl-install/c/stuff.xs.pm12
2 files changed, 3 insertions, 10 deletions
diff --git a/perl-install/c/stuff.pm b/perl-install/c/stuff.pm
index ea0320225..daf5d8ef3 100644
--- a/perl-install/c/stuff.pm
+++ b/perl-install/c/stuff.pm
@@ -23,6 +23,7 @@ sub headerGetEntry {
$q eq 'size' and return headerGetEntry_int($h, RPMTAG_SIZE());
$q eq 'filenames' and return headerGetEntry_string_list($h, RPMTAG_FILENAMES());
$q eq 'obsoletes' and return headerGetEntry_string_list($h, RPMTAG_OBSOLETES());
+ $q eq 'requires' and return headerGetEntry_string_list($h, RPMTAG_REQUIRENAME());
}
1;
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 93a9e8ab3..831b0c1c1 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -65,16 +65,8 @@ Xtest(display)
XSetCloseDownMode(d, RetainPermanent);
XCloseDisplay(d);
}
- {
- char *args[2];
- args[0] = d ? "false" : "true"; /* inverted on purpose! */
- args[1] = NULL;
- execvp(args[0], args);
- }
- printf("***************** SHOUDNT GET THERE ***************\n");
- exit(d != NULL);
+ _exit(d != NULL);
}
-
waitpid(pid, &RETVAL, 0);
OUTPUT:
RETVAL
@@ -628,7 +620,7 @@ headerGetEntry_string_list(h, query)
VT_ACTIVATE VT_WAITACTIVE VT_GETSTATE CDROM_LOCKDOOR CDROMEJECT
) ],
);
-push @macros, [ qw(int RPMTAG_NAME RPMTAG_GROUP RPMTAG_SIZE RPMTAG_VERSION RPMTAG_SUMMARY RPMTAG_DESCRIPTION RPMTAG_RELEASE RPMTAG_ARCH RPMTAG_FILENAMES RPMTAG_OBSOLETES) ]
+push @macros, [ qw(int RPMTAG_NAME RPMTAG_GROUP RPMTAG_SIZE RPMTAG_VERSION RPMTAG_SUMMARY RPMTAG_DESCRIPTION RPMTAG_RELEASE RPMTAG_ARCH RPMTAG_FILENAMES RPMTAG_OBSOLETES RPMTAG_REQUIRENAME) ]
if $ENV{C_RPM};
$\= "\n";