mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

* extfs/rpm: Recognize CONFLICTS.

Browse Source 
* extfs/trpm: Likewise.
This commit is contained in:
Leonard den Ottolander 2006-11-01 10:30:26 +00:00
parent c979e827ce
commit 16bf1ca415
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vfs/ChangeLog
View File

@ -1,9 +1,14 @@
2006-10-15 Leonard den Ottolander <leonard den ottolander nl>
2006-11-01 Jindrich Novy <jnovy@redhat.com>
* extfs/rpm: Recognize CONFLICTS.
* extfs/trpm: Likewise.
2006-10-15 Leonard den Ottolander <leonard den ottolander nl>
* utilvfs.c (is_year): Revert range of valid years to 1900 - 3000 as
parsing has been fixed.
2006-08-01 Leonard den Ottolander <leonard den ottolander nl>
2006-08-01 Leonard den Ottolander <leonard den ottolander nl>
* extfs/rpm: Restore legacy RPM tags. There's no harm in keeping them
around for backward compatibility.
@ -39,7 +44,7 @@
* extfs/rpm: Remove support for obsoleted RPM tags.
* extfs/trpm: Likewise.
2006-05-28 Leonard den Ottolander <leonard den ottolander nl>
2006-05-28 Leonard den Ottolander <leonard den ottolander nl>
* extfs/mailfs.in (parse_date): Output 3 date fields not 4. Range to
output time not year is slightly larger than the range used by

4
vfs/extfs/rpm
View File

@ -122,12 +122,15 @@ mcrpmfs_list ()
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
$RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
$RPM -qp --qf "[%{CONFLICTS}\n]" "$f" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" ||
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
else
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
fi
@ -171,6 +174,7 @@ mcrpmfs_copyout ()
INFO/CHANGELOG) $RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$f" > "$3"; exit 0;;
INFO/SIZE) $RPM -qp --qf "%{SIZE} bytes\n" "$f" > "$3"; exit 0;;
INFO/OBSOLETES) $RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$f" > "$3"; exit 0;;
INFO/CONFLICTS) $RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$f" >"$3"; exit 0;;
CONTENTS.cpio) $RPM2CPIO "$1" > "$3"; exit 0;;
*)
;;

4
vfs/extfs/trpm
View File

@ -112,12 +112,15 @@ mcrpmfs_list ()
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
$RPM -q --qf "[%{PROVIDES}\n]" -- "$1" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
$RPM -q --qf "[%{CONFLICTS}\n]" -- "$1" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
test "`$RPM -q --qf \"%{CHANGELOGTEXT}\" -- "$1"`" = "(none)" ||
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
else
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
fi
@ -148,6 +151,7 @@ mcrpmfs_copyout ()
INFO/REQUIRENAME) $RPM -q --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" -- "$1" > "$3"; exit 0;;
INFO/OBSOLETES) $RPM -q --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" -- "$1" > "$3"; exit 0;;
INFO/PROVIDES) $RPM -q --qf "[%{PROVIDES}\n]" -- "$1" > "$3"; exit 0;;
INFO/CONFLICTS) $RPM -q --qf "[%{CONFLICTS}\n]" -- "$1" > "$3"; exit 0;;
INFO/SCRIPTS/PREIN) $RPM -q --qf "%{RPMTAG_PREIN}\n" -- "$1" > "$3"; exit 0;;
INFO/SCRIPTS/POSTIN) $RPM -q --qf "%{RPMTAG_POSTIN}\n" -- "$1" > "$3"; exit 0;;
INFO/SCRIPTS/PREUN) $RPM -q --qf "%{RPMTAG_PREUN}\n" -- "$1" > "$3"; exit 0;;