diff options
| -rw-r--r-- | lib/hash.c | 3 | ||||
| -rw-r--r-- | lib/transaction.c | 20 | ||||
| -rw-r--r-- | popt/findme.c | 4 | ||||
| -rw-r--r-- | popt/findme.h | 4 | ||||
| -rw-r--r-- | popt/po/popt.pot | 6 | ||||
| -rw-r--r-- | popt/popt.c | 4 | ||||
| -rw-r--r-- | popt/popt.h | 4 | ||||
| -rw-r--r-- | popt/poptconfig.c | 4 | ||||
| -rw-r--r-- | popt/popthelp.c | 4 | ||||
| -rw-r--r-- | popt/poptint.h | 4 | ||||
| -rw-r--r-- | popt/poptparse.c | 4 |
11 files changed, 53 insertions, 8 deletions
diff --git a/lib/hash.c b/lib/hash.c index 73f37a24b..a8c67acac 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,4 +1,5 @@ -/** \file lib/hash.c +/** + * \file lib/hash.c * Hash table implemenation */ diff --git a/lib/transaction.c b/lib/transaction.c index c7743c676..9f3a5f170 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1,3 +1,7 @@ +/** \ingroup rpmtrans + * \file lib/transaction.c + */ + #include "system.h" #include <rpmlib.h> @@ -194,20 +198,25 @@ static void psAppendFile(rpmProblemSet probs, rpmProblemType type, static int archOkay(Header h) { - int_8 * pkgArchNum; void * pkgArch; - int type, count, archNum; + int type, count; /* make sure we're trying to install this on the proper architecture */ headerGetEntry(h, RPMTAG_ARCH, &type, (void **) &pkgArch, &count); +#ifndef DYING if (type == RPM_INT8_TYPE) { + int_8 * pkgArchNum; + int archNum; + /* old arch handling */ rpmGetArchInfo(NULL, &archNum); pkgArchNum = pkgArch; if (archNum != *pkgArchNum) { return 0; } - } else { + } else +#endif + { /* new arch handling */ if (!rpmMachineScore(RPM_MACHTABLE_INSTARCH, pkgArch)) { return 0; @@ -224,11 +233,14 @@ static int osOkay(Header h) /* make sure we're trying to install this on the proper os */ headerGetEntry(h, RPMTAG_OS, &type, (void **) &pkgOs, &count); +#ifndef DYING if (type == RPM_INT8_TYPE) { /* v1 packages and v2 packages both used improper OS numbers, so just deal with it hope things work */ return 1; - } else { + } else +#endif + { /* new os handling */ if (!rpmMachineScore(RPM_MACHTABLE_INSTOS, pkgOs)) { return 0; diff --git a/popt/findme.c b/popt/findme.c index 8518be13c..b5878a12b 100644 --- a/popt/findme.c +++ b/popt/findme.c @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/findme.c + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/findme.h b/popt/findme.h index 5e93963d6..78f714ee5 100644 --- a/popt/findme.h +++ b/popt/findme.h @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/findme.h + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/po/popt.pot b/popt/po/popt.pot index e5aae73cd..a8101efa2 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-08-04 15:48-0400\n" +"POT-Creation-Date: 2000-08-27 14:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,10 +14,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: popthelp.c:23 +#: popthelp.c:27 msgid "Show this help message" msgstr "" -#: popthelp.c:24 +#: popthelp.c:28 msgid "Display brief usage message" msgstr "" diff --git a/popt/popt.c b/popt/popt.c index 4979ed596..0726c325b 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/popt.c + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/popt.h b/popt/popt.h index 2209f385c..b6e1f6be8 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/popt.h + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/poptconfig.c b/popt/poptconfig.c index 7a1a4c2bf..9e50b528d 100644 --- a/popt/poptconfig.c +++ b/popt/poptconfig.c @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/poptconfig.c + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/popthelp.c b/popt/popthelp.c index c36eceadd..8eed7eeb5 100644 --- a/popt/popthelp.c +++ b/popt/popthelp.c @@ -1,5 +1,9 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/** \ingroup popt + * \file popt/popthelp.c + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/poptint.h b/popt/poptint.h index a1edb97c4..39ae3ee4e 100644 --- a/popt/poptint.h +++ b/popt/poptint.h @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/poptint.h + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ diff --git a/popt/poptparse.c b/popt/poptparse.c index 7c9f06be3..7a2d50545 100644 --- a/popt/poptparse.c +++ b/popt/poptparse.c @@ -1,3 +1,7 @@ +/** \ingroup popt + * \file popt/poptparse.c + */ + /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ |