From 5b06c479a5ee7c545e105c0a9ac55daa31fc4836 Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 12 Jan 2001 21:47:49 +0000 Subject: [PATCH] - hack: permit installer to determine package ordering using 1000003 tag. CVS patchset: 4435 CVS date: 2001/01/12 21:47:49 --- CHANGES | 1 + lib/depends.c | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++-- po/cs.po | 16 +- po/da.po | 16 +- po/de.po | 16 +- po/es.po | 16 +- po/eu_ES.po | 16 +- po/fi.po | 16 +- po/fr.po | 16 +- po/gl.po | 16 +- po/hu.po | 16 +- po/id.po | 16 +- po/is.po | 16 +- po/it.po | 16 +- po/ja.po | 18 +- po/ko.po | 16 +- po/no.po | 16 +- po/pl.po | 16 +- po/pt.po | 16 +- po/pt_BR.po | 16 +- po/ro.po | 16 +- po/rpm.pot | 16 +- po/ru.po | 16 +- po/sk.po | 16 +- po/sl.po | 18 +- po/sr.po | 16 +- po/sv.po | 16 +- po/tr.po | 16 +- po/uk.po | 16 +- po/wa.po | 16 +- po/zh.po | 16 +- po/zh_CN.GB2312.po | 16 +- rpm.spec | 5 +- rpm.spec.in | 5 +- 34 files changed, 847 insertions(+), 257 deletions(-) diff --git a/CHANGES b/CHANGES index 30cd219..f8d08e5 100644 --- a/CHANGES +++ b/CHANGES @@ -102,6 +102,7 @@ - fix: find-requires.perl needed update (#23450). - fix: don't hang on build error. - fix: remove "error: " prefix from signature verification message. + - hack: permit installer to determine package ordering using 1000003 tag. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/depends.c b/lib/depends.c index 654736f..31fe1e0 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1438,6 +1438,545 @@ static int ignoreDep(struct availablePackage * p, struct availablePackage * q) } #endif +#if defined(MULTICD_ORDERING) +static const char *firstcdnames[] = { + "Canna", + "FreeWnn-common", + "Glide3", + "ImageMagick", + "ImageMagick-c++", + "ImageMagick-devel", + "Inti", + "LPRng", + "MAKEDEV", + "Mesa", + "ORBit", + "ORBit-devel", + "PyXML", + "SDL", + "SDL-devel", + "SDL_image", + "SDL_mixer", + "SVGATextMode", + "SysVinit", + "VFlib2", + "VFlib2-VFjfm", + "VFlib2-devel", + "WindowMaker", + "WindowMaker-libs", + "Wnn6-SDK", + "Wnn6-SDK-devel", + "XFree86", + "XFree86-100dpi-fonts", + "XFree86-3DLabs", + "XFree86-75dpi-fonts", + "XFree86-8514", + "XFree86-AGX", + "XFree86-FBDev", + "XFree86-I128", + "XFree86-ISO8859-2", + "XFree86-ISO8859-2-100dpi-fonts", + "XFree86-ISO8859-2-75dpi-fonts", + "XFree86-ISO8859-2-Type1-fonts", + "XFree86-ISO8859-7", + "XFree86-ISO8859-7-100dpi-fonts", + "XFree86-ISO8859-7-75dpi-fonts", + "XFree86-ISO8859-7-Type1-fonts", + "XFree86-ISO8859-9", + "XFree86-ISO8859-9-100dpi-fonts", + "XFree86-ISO8859-9-75dpi-fonts", + "XFree86-KOI8-R", + "XFree86-KOI8-R-100dpi-fonts", + "XFree86-KOI8-R-75dpi-fonts", + "XFree86-Mach32", + "XFree86-Mach64", + "XFree86-Mach8", + "XFree86-Mono", + "XFree86-P9000", + "XFree86-S3", + "XFree86-S3V", + "XFree86-SVGA", + "XFree86-V4L", + "XFree86-VGA16", + "XFree86-W32", + "XFree86-Xnest", + "XFree86-Xvfb", + "XFree86-cyrillic-fonts", + "XFree86-devel", + "XFree86-doc", + "XFree86-jpfonts", + "XFree86-libs", + "XFree86-tools", + "XFree86-twm", + "XFree86-xdm", + "XFree86-xf86cfg", + "XFree86-xfs", + "Xaw3d", + "Xaw3d-devel", + "Xconfigurator", + "amanda", + "anaconda", + "apache", + "asp2php", + "aspell", + "audiofile", + "audiofile-devel", + "aumix", + "autoconf", + "automake", + "awesfx", + "basesystem", + "bash", + "bind", + "bind-utils", + "binutils", + "blas", + "bzip2", + "cdda2wav", + "cdrecord", + "chkconfig", + "chkfontpath", + "cleanfeed", + "compat-egcs", + "compat-egcs-c++", + "compat-glibc", + "compat-libstdc++", + "console-tools", + "control-center", + "control-panel", + "cpio", + "cpp", + "cracklib", + "cracklib-dicts", + "ctags", + "cyrus-sasl", + "db1", + "db1-devel", + "db2", + "db3", + "dev", + "dialog", + "diffutils", + "docbook", + "e2fsprogs", + "ed", + "emacs", + "esound", + "esound-devel", + "expat", + "expect", + "extace", + "fetchmail", + "file", + "filesystem", + "fileutils", + "findutils", + "flex", + "fnlib", + "fortune-mod", + "freetype", + "fvwm2-icons", + "gal", + "gawk", + "gcc", + "gd", + "gdb", + "gdbm", + "gdk-pixbuf", + "ghostscript", + "ghostscript-fonts", + "gimp", + "glib", + "glib-devel", + "glib-gtkbeta", + "glib-gtkbeta-devel", + "glib10", + "glibc", + "glibc-devel", + "gmp", + "gnome-core", + "gnome-games", + "gnome-libs", + "gnome-libs-devel", + "gnome-objc", + "gnome-pim", + "gnome-print", + "gnuchess", + "gnupg", + "gnuplot", + "gpm", + "grep", + "groff", + "gtk+", + "gtk+-devel", + "gtk+-gtkbeta", + "guile", + "gzip", + "htmlview", + "imlib", + "imlib-devel", + "indent", + "indexhtml", + "inews", + "info", + "initscripts", + "inn", + "ipchains", + "iproute", + "ipxutils", + "isapnptools", + "isdn4k-utils", + "jed-common", + "kakasi", + "kbdconfig", + "kde1-compat", + "kde1-compat-devel", + "kdebase", + "kdelibs", + "kdelibs-devel", + "kdelibs-sound", + "kdemultimedia", + "kdesupport", + "kdesupport-devel", + "kernel", + "kernel-headers", + "kernel-smp", + "kgcc", + "krb5-libs", + "krb5-workstation", + "krbafs", + "kudzu", + "lapack", + "less", + "libPropList", + "libgal3", + "libgcj", + "libgcj-devel", + "libghttp", + "libglade", + "libgnomeprint11", + "libgtop", + "libjpeg", + "libjpeg-devel", + "libmng", + "libodbc++", + "libogg", + "libogg-devel", + "libole2", + "libpng", + "libpng-devel", + "librep", + "libstdc++", + "libstdc++-devel", + "libtermcap", + "libtiff", + "libtiff-devel", + "libtool-libs", + "libungif", + "libungif-devel", + "libunicode", + "libxml", + "libxml-devel", + "linuxconf", + "lm_sensors", + "logrotate", + "losetup", + "m4", + "mailcap", + "make", + "mc", + "metamail", + "mgetty", + "mikmod", + "mingetty", + "mkinitrd", + "mkisofs", + "mktemp", + "mod_php", + "modutils", + "mount", + "mouseconfig", + "mozilla", + "mpage", + "mpg123", + "mtr", + "mysql", + "mysql-devel", + "ncurses", + "net-tools", + "netpbm", + "netpbm-devel", + "netpbm-progs", + "netscape-common", + "newt", + "nmh", + "nscd", + "nut-client", + "openjade", + "openldap", + "openssh", + "openssl", + "pam", + "pango-gtkbeta", + "pango-gtkbeta-devel", + "pdksh", + "perl", + "perl-DBI", + "php", + "pilot-link", + "playmidi", + "popt", + "portmap", + "postgresql", + "postgresql-devel", + "postgresql-tcl", + "ppp", + "procmail", + "procps", + "psmisc", + "pspell", + "pspell-devel", + "psutils", + "pvm", + "pwdb", + "pygnome", + "pygnome-libglade", + "pygtk", + "pygtk-libglade", + "python", + "python-xmlrpc", + "python2", + "pythonlib", + "qt", + "qt-devel", + "qt1x", + "readline", + "redhat-logos", + "rep-gtk", + "rep-gtk-gnome", + "rep-gtk-libglade", + "rhn_register", + "rhn_register-gnome", + "rhs-printfilters", + "rmt", + "rp-pppoe", + "rp3", + "rpm", + "rpm-python", + "samba-common", + "sane", + "sash", + "sawfish", + "sed", + "sendmail", + "sendmail-doc", + "setserial", + "setup", + "setuptool", + "sgml-common", + "sgml-tools", + "sh-utils", + "shadow-utils", + "shapecfg", + "sharutils", + "skkdic", + "skkinput", + "slang", + "slang-devel", + "sliplogin", + "slocate", + "slrn", + "slrn-pull", + "smpeg", + "smpeg-devel", + "smpeg-xmms", + "sndconfig", + "sox", + "sox-devel", + "specspo", + "squid", + "stat", + "statserial", + "strace", + "stunnel", + "stylesheets", + "stylesheets-db2pdf", + "sudo", + "switchdesk", + "switchdesk-gnome", + "switchdesk-kde", + "symlinks", + "sysctlconfig", + "sysklogd", + "syslinux", + "sysreport", + "sysstat", + "talk", + "talk-server", + "taper", + "tar", + "tcl", + "tcllib", + "tclx", + "tcp_wrappers", + "tcpdump", + "tcsh", + "telnet", + "telnet-server", + "termcap", + "tetex", + "tetex-afm", + "tetex-doc", + "tetex-dvilj", + "tetex-dvips", + "tetex-fonts", + "tetex-latex", + "tetex-xdvi", + "texinfo", + "textutils", + "tftp", + "tftp-server", + "time", + "timeconfig", + "timed", + "timetool", + "timidity++", + "tin", + "tix", + "tk", + "tkinter", + "tksysv", + "tmpwatch", + "traceroute", + "transfig", + "tree", + "tripwire", + "trn", + "trojka", + "ucd-snmp", + "ucd-snmp-devel", + "ucd-snmp-utils", + "umb-scheme", + "unarj", + "units", + "unix2dos", + "unixODBC", + "unixODBC-devel", + "unixODBC-kde", + "unzip", + "up2date", + "up2date-gnome", + "urlview", + "urw-fonts", + "usbview", + "usermode", + "utempter", + "util-linux", + "uucp", + "vim-X11", + "vim-common", + "vim-enhanced", + "vim-minimal", + "vixie-cron", + "vlock", + "vnc", + "vnc-doc", + "vnc-server", + "vorbis", + "vorbis-devel", + "w3c-libwww", + "w3c-libwww-apps", + "w3c-libwww-devel", + "w3m", + "watanabe-vf", + "wget", + "which", + "whois", + "wireless-tools", + "wmakerconf", + "wmconfig", + "words", + "wu-ftpd", + "wvdial", + "x3270", + "x3270-text", + "xbill", + "xbl", + "xboard", + "xboing", + "xcdroast", + "xchat", + "xcpustate", + "xdaliclock", + "xdelta", + "xdelta-devel", + "xemacs", + "xemacs-el", + "xemacs-info", + "xfig", + "xgammon", + "xinetd", + "xinitrc", + "xisdnload", + "xjewel", + "xlispstat", + "xloadimage", + "xlockmore", + "xmailbox", + "xmms", + "xmms-devel", + "xmms-gnome", + "xmorph", + "xosview", + "xpaint", + "xpat2", + "xpdf", + "xpilot", + "xpuzzles", + "xrn", + "xsane", + "xsane-gimp", + "xscreensaver", + "xsri", + "xsysinfo", + "xtoolwait", + "xtrojka", + "xtt-fonts", + "xxgdb", + "yp-tools", + "ypbind", + "ypserv", + "ytalk", + "zip", + "zlib", + "zlib-devel", + "zsh", +}; + +static int cdCmp(const void *a, const void *b) { + const char **as = (const char **)a; + const char **bs = (const char **)b; + int rc = strcmp(*as, *bs); + return rc; +} + +static int cdpriority(Header h) +{ + const char * needle, * name; + int rc; + + headerNVR(h, &name, NULL, NULL); + needle = bsearch(&name, firstcdnames, + sizeof(firstcdnames)/sizeof(firstcdnames[0]), + sizeof(name), cdCmp); + rc =(needle ? 1 : 2); + return rc; +} + +#endif + +#define RPMTAG_MULTICD 1000003 + /** * Recursively mark all nodes with their predecessors. * @param tsi successor chain @@ -1616,7 +2155,7 @@ static void addQ(struct availablePackage * p, return; } for (qprev = NULL, q = (*qp); q != NULL; qprev = q, q = q->tsi.tsi_suc) { - if (q->tsi.tsi_qcnt < p->tsi.tsi_qcnt) + if (q->tsi.tsi_qcnt <= p->tsi.tsi_qcnt) break; } if (qprev == NULL) { /* insert at beginning of list */ @@ -1661,6 +2200,13 @@ int rpmdepOrder(rpmTransactionSet ts) for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++) { int matchNum; +#if defined(MULTICD_ORDERING) +/* Simulate multicd ordering tag value. */ +if (!headerIsEntry(p->h, RPMTAG_MULTICD)) { + int_32 pri = cdpriority(p->h); + headerAddEntry(p->h, RPMTAG_MULTICD, RPM_INT32_TYPE, &pri, 1); +} +#endif if (p->requiresCount <= 0) continue; @@ -1719,9 +2265,23 @@ rescan: /* T5. Output front of queue (T7. Remove from queue.) */ for (; q != NULL; q = q->tsi.tsi_suc) { + const char * qcd = ""; + int_32 *qpri; + char qcdbuf[4]; - rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s-%s-%s\n", orderingCount, - qlen, q->tsi.tsi_qcnt, q->name, q->version, q->release); + if (!headerGetEntry(q->h, RPMTAG_MULTICD, NULL, (void **)&qpri, NULL)) { + qpri = 0; + qcd = ""; + } else { + qcdbuf[0] = '@' + (*qpri % 16); + qcdbuf[1] = ' '; + qcdbuf[2] = '\0'; + qcd = qcdbuf; + } + + rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s%s-%s-%s\n", orderingCount, + qlen, q->tsi.tsi_qcnt, qcd, + q->name, q->version, q->release); ordering[orderingCount++] = q - ts->addedPackages.list; qlen--; loopcheck--; @@ -1750,17 +2310,40 @@ rescan: /* If no predecessors remain, dump successors in presentation order. */ if (loopcheck == qlen) { - rpmMessage(RPMMESS_DEBUG, - _("========== successors only (presentation order\n")); + int k; - for (i = 0, q = ts->addedPackages.list; i < npkgs; i++, q++) { - if (q->tsi.tsi_qcnt == -1234) - continue; - rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s-%s-%s\n", orderingCount, - qlen, q->tsi.tsi_qcnt, q->name, q->version, q->release); - ordering[orderingCount++] = q - ts->addedPackages.list; - qlen--; - loopcheck--; + rpmMessage(RPMMESS_DEBUG, + _("========== successors only (presentation order)\n")); + + for (k = 0; k < 16; k++) { + for (i = 0, q = ts->addedPackages.list; i < npkgs; i++, q++) { + const char * qcd = ""; + int_32 *qpri; + char qcdbuf[4]; + + if (q->tsi.tsi_qcnt == -1234) + continue; + if (!headerGetEntry(q->h, RPMTAG_MULTICD, NULL, (void **)&qpri, NULL)) { + qpri = 0; + qcd = ""; + } else { + qcdbuf[0] = '@' + (*qpri % 16); + qcdbuf[1] = ' '; + qcdbuf[2] = '\0'; + qcd = qcdbuf; + } + if (*qpri != k) + continue; + + rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s%s-%s-%s\n", + orderingCount, qlen, q->tsi.tsi_qcnt, qcd, + q->name, q->version, q->release); + ordering[orderingCount++] = q - ts->addedPackages.list; + qlen--; + loopcheck--; + } + if (loopcheck == 0) + break; } } diff --git a/po/cs.po b/po/cs.po index b1ecb1e..453453b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2449,30 +2449,30 @@ msgstr "bal msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/da.po b/po/da.po index b9af062..5de9028 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -2410,30 +2410,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/de.po b/po/de.po index 13d1d12..f2dd6f0 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2645,30 +2645,30 @@ msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/es.po b/po/es.po index 339c253..f58982b 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index f715a7b..b32a9af 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 821239d..a50f804 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2567,30 +2567,30 @@ msgstr "paketti %s ei ole %s:ss msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index cc27e21..e335dcd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2001-01-11 08:57-0500\n" +msgstr "POT-Creation-Date: 2001-01-12 16:42-0500\n" #: build.c:26 #, fuzzy, c-format @@ -2579,30 +2579,30 @@ msgstr "aucun package n'a msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 339c253..f58982b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 339c253..f58982b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/id.po b/po/id.po index 339c253..f58982b 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/is.po b/po/is.po index 1a5f0f9..d4e60d8 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2410,30 +2410,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/it.po b/po/it.po index 339c253..f58982b 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index f4a1667..cdc323b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.147 2001/01/11 14:13:06 jbj Exp $ +# $Id: ja.po,v 1.148 2001/01/12 21:47:51 jbj Exp $ #: rpm.c:185 rpmqv.c:386 #, c-format msgid "rpm: %s\n" @@ -2530,30 +2530,30 @@ msgstr " msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/ko.po b/po/ko.po index 339c253..f58982b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/no.po b/po/no.po index 55bb4d9..d76edeb 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2431,30 +2431,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 806ed72..b25428b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2528,30 +2528,30 @@ msgstr "zale msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 8db0507..8dafde4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -2374,30 +2374,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5bf39c9..0795064 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2001-01-11 08:57-0500\n" +msgstr "POT-Creation-Date: 2001-01-12 16:42-0500\n" # , c-format #: build.c:26 @@ -2646,30 +2646,30 @@ msgstr "n msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index fbc6d8b..3ee16b6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -2372,30 +2372,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index f715a7b..b32a9af 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 59a226d..d14c330 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -2464,30 +2464,30 @@ msgstr " msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index eeae1a3..010ac84 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2537,30 +2537,30 @@ msgstr "po msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/sl.po b/po/sl.po index fdd0538..0086247 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.132 2001/01/11 14:13:07 jbj Exp $ +# $Id: sl.po,v 1.133 2001/01/12 21:47:56 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2521,30 +2521,30 @@ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/sr.po b/po/sr.po index 1c535e0..47daf1a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -2531,30 +2531,30 @@ msgstr "paket %s nije naveden u %s" msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 811269b..90fb1b1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2439,30 +2439,30 @@ msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index daa0974..a99c3e3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2579,30 +2579,30 @@ msgstr "%s paketi %s alt msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index 339c253..f58982b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 339c253..f58982b 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 339c253..f58982b 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 339c253..f58982b 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-11 08:57-0500\n" +"POT-Creation-Date: 2001-01-12 16:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2377,30 +2377,30 @@ msgstr "" msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1522 +#: lib/depends.c:2061 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:2199 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1707 +#: lib/depends.c:2253 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1754 -msgid "========== successors only (presentation order\n" +#: lib/depends.c:2316 +msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1812 +#: lib/depends.c:2395 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1843 +#: lib/depends.c:2426 msgid "========== continuing tsort ...\n" msgstr "" diff --git a/rpm.spec b/rpm.spec index 78c19f8..0d1346b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.23 +Release: 0.24 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,9 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Jan 12 2001 Jeff Johnson +- hack: permit installer to determine package ordering using 1000003 tag. + * Thu Jan 11 2001 Jeff Johnson - fix: don't hang on build error. - fix: remove "error: " prefix from signature verification message. diff --git a/rpm.spec.in b/rpm.spec.in index 4ff19ee..640a69f 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version @VERSION@ Version: %{version} -Release: 0.23 +Release: 0.24 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,9 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Jan 12 2001 Jeff Johnson +- hack: permit installer to determine package ordering using 1000003 tag. + * Thu Jan 11 2001 Jeff Johnson - fix: don't hang on build error. - fix: remove "error: " prefix from signature verification message. -- 2.7.4