2 ===================================================================
3 RCS file: /cvs/devel/rpm/lib/fsm.c,v
4 retrieving revision 2.101
5 retrieving revision 2.103
6 diff -u -u -r2.101 -r2.103
7 --- rpm/lib/fsm.c 5 Jan 2004 14:09:47 -0000 2.101
8 +++ rpm/lib/fsm.c 10 Jan 2004 18:48:19 -0000 2.103
13 - if (fsm->fcontext == NULL)
14 + if (fsm->fcontext == NULL || *fsm->fcontext == '\0'
15 + || !strcmp(fsm->fcontext, "<<none>>"))
17 rc = lsetfilecon(fsm->path, (security_context_t)fsm->fcontext);
18 if (_fsm_debug && (stage & FSM_SYSCALL))
20 ===================================================================
21 RCS file: /cvs/devel/rpm/lib/rpmfi.c,v
22 retrieving revision 2.52
23 retrieving revision 2.54
24 diff -u -u -r2.52 -r2.54
25 --- rpm/lib/rpmfi.c 5 Jan 2004 14:09:47 -0000 2.52
26 +++ rpm/lib/rpmfi.c 9 Jan 2004 23:17:33 -0000 2.54
28 fi = rpmfiInit(fi, 0);
30 while (rpmfiNext(fi) >= 0) {
37 fi = rpmfiInit(fi, 0);
39 while (rpmfiNext(fi) >= 0) {
46 ===================================================================
47 RCS file: /cvs/devel/rpm/lib/rpmsx.c,v
48 retrieving revision 2.6
49 diff -u -u -r2.6 rpmsx.c
50 --- rpm/lib/rpmsx.c 25 Dec 2003 23:00:45 -0000 2.6
51 +++ rpm/lib/rpmsx.c 17 Jan 2004 17:52:19 -0000
55 if ((fp = fopen(fn, "r")) == NULL) {
57 + if (ENOENT == errno)
58 + fprintf(stderr, _("Parsing SELinux file contexts skipped: %s: %s\n"), fn, strerror(errno));
64 --- rpm-4.3/po/pl.po.orig 2004-02-01 20:33:57.000000000 +0100
65 +++ rpm-4.3/po/pl.po 2004-02-01 20:51:30.760959200 +0100
66 @@ -2887,6 +2887,11 @@
67 msgid "Unable to open %s for reading: %s.\n"
68 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s.\n"
72 +msgid "Parsing SELinux file contexts skipped: %s: %s\n"
73 +msgstr "Pominiêto analizê kontekstów plików SELinuksa: %s: %s\n"
77 msgid "%s: no newline on line number %d (only read %s)\n"