RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 13-Mar-2009 23:46:12
Branch: HEAD Handle: 2009031322461200
Modified files:
rpm CHANGES
rpm/lib rpmrc.c
Log:
get the list of compatible archs printed with '--showrc' from mire
platform patterns.
Summary:
Revision Changes Path
1.2818 +2 -0 rpm/CHANGES
2.263 +3 -3 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2817 -r1.2818 CHANGES
--- rpm/CHANGES 12 Mar 2009 21:56:36 -0000 1.2817
+++ rpm/CHANGES 13 Mar 2009 22:46:12 -0000 1.2818
@@ -1,5 +1,7 @@
5.2a3 -> 5.2a4:
+ - proyvind: get the list of compatible archs printed with '--showrc' from
+ mire platform patterns.
- proyvind: use cpuinfo() probe for detecting platform rather than
libcpuinfo directly.
- jbj: delete ancient header+payload RSA signatures too using GPG
(#488953).
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.262 -r2.263 rpmrc.c
--- rpm/lib/rpmrc.c 13 Mar 2009 18:33:46 -0000 2.262
+++ rpm/lib/rpmrc.c 13 Mar 2009 22:46:12 -0000 2.263
@@ -1080,6 +1080,7 @@
int i;
machEquivTable equivTable;
int xx;
+ miRE mire;
/* the caller may set the build arch which should be printed here */
fprintf(fp, "ARCHITECTURE AND OS:\n");
@@ -1103,9 +1104,8 @@
fprintf(fp, "install os : %s\n", current[OS]);
fprintf(fp, "compatible archs :");
- equivTable = &tables[RPM_MACHTABLE_INSTARCH].equiv;
- for (i = 0; i < equivTable->count; i++)
- fprintf(fp," %s", equivTable->list[i].name);
+ for (mire = platpat, i = 0; i < nplatpat; i++)
+ fprintf(fp, " %s", mire[i].pattern);
fprintf(fp, "\n");
fprintf(fp, "compatible os's :");
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
