updated: [5f84762] extfs/rpm,extfs/trpm: removed obsolete rpm tags

Enrico Weigelt, metux IT service weigelt at metux.de
Wed Feb 4 03:09:38 UTC 2009


The following commit has been merged in the mc-4.6 branch:
commit 5f84762472cd481e25bd5c2b9a115200192abbc3
Author: Enrico Weigelt, metux IT service <weigelt at metux.de>
Date:   Wed Feb 4 04:09:30 2009 +0100

    extfs/rpm,extfs/trpm: removed obsolete rpm tags

diff --git a/.gitignore b/.gitignore
index 7610001..8ff76a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ missing
 mkinstalldirs
 pkginfo
 prototype
-rpm
 stamp-h
 stamp-h?
 stamp-h.in
diff --git a/ChangeLog b/ChangeLog
index 2421f92..b48e121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,7 +62,7 @@
 	* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish code
 	  so that symlinks and files which special characters works now
 
-2009-01-25 Enrico Weigelt <weigelt at metux.de>
+2009-01-25 Enrico Weigelt, metux ITS <weigelt at metux.de>
 
 	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
 	* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@ -71,8 +71,9 @@
 	  translated strings. This breaks now once every history file
 	  but afterwards this will be stable
 
-2009-01-24 Enrico Weigelt <weigelt at metux.de>
+2009-01-24 Enrico Weigelt, metux IT service <weigelt at metux.de>
 
+	* vfs/extfs/rpm, vfs/extfs/trpm: removed obsolete rpm tags
 	* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 
 2009-01-24 Patrick Winnertz <winnie at debian.org>
diff --git a/vfs/extfs/rpm b/vfs/extfs/rpm
index 08d62c2..219bc8a 100644
--- a/vfs/extfs/rpm
+++ b/vfs/extfs/rpm
@@ -95,10 +95,6 @@ mcrpmfs_list ()
 	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
      test "`$RPM -qp --qf \"%{URL}\" \"$f\"`" = "(none)" ||
 	 echo "$FILEPREF 0 $DATE INFO/URL"
-     test "`$RPM -qp --qf \"%{SERIAL}\" \"$f\"`" = "(none)" ||
-	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-     test "`$RPM -qp --qf \"%{COPYRIGHT}\" \"$f\"`" = "(none)" ||
-	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
      test "`$RPM -qp --qf \"%{EPOCH}\" \"$f\"`" = "(none)" ||
 	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
      test "`$RPM -qp --qf \"%{LICENSE}\" \"$f\"`" = "(none)" ||
@@ -106,8 +102,6 @@ mcrpmfs_list ()
     else
 	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
 	 echo "$FILEPREF 0 $DATE INFO/URL"
-	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
 	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
 	 echo "$FILEPREF 0 $DATE INFO/LICENSE"
     fi
@@ -156,8 +150,6 @@ mcrpmfs_copyout ()
 	INFO/PACKAGER)		$RPM -qp --qf "%{PACKAGER}\n" "$f" > "$3"; exit 0;;
 	INFO/URL)		$RPM -qp --qf "%{URL}\n" "$f" >"$3"; exit 0;;
 	INFO/BUILDTIME)		$RPM -qp --qf "%{BUILDTIME:date}\n" "$f" >"$3"; exit 0;;
-	INFO/SERIAL)		$RPM -qp --qf "%{SERIAL}\n" "$f" >"$3"; exit 0;;
-	INFO/COPYRIGHT)		$RPM -qp --qf "%{COPYRIGHT}\n" "$f" >"$3"; exit 0;;
 	INFO/EPOCH)		$RPM -qp --qf "%{EPOCH}\n" "$f" >"$3"; exit 0;;
 	INFO/LICENSE)		$RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit 0;;
 	INFO/RPMVERSION)	$RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3"; exit 0;;
diff --git a/vfs/extfs/trpm b/vfs/extfs/trpm
index 9900d1b..d9a7930 100644
--- a/vfs/extfs/trpm
+++ b/vfs/extfs/trpm
@@ -85,10 +85,6 @@ mcrpmfs_list ()
 	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
      test "`$RPM -q --qf \"%{URL}\" -- "$1"`" = "(none)" ||
 	 echo "$FILEPREF 0 $DATE INFO/URL"
-     test "`$RPM -q --qf \"%{SERIAL}\" -- "$1"`" = "(none)" ||
-	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-     test "`$RPM -q --qf \"%{COPYRIGHT}\" -- "$1"`" = "(none)" ||
-	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
      test "`$RPM -q --qf \"%{EPOCH}\" -- "$1"`" = "(none)" ||
 	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
      test "`$RPM -q --qf \"%{LICENSE}\" -- "$1"`" = "(none)" ||
@@ -96,8 +92,6 @@ mcrpmfs_list ()
     else
 	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
 	 echo "$FILEPREF 0 $DATE INFO/URL"
-	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
 	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
 	 echo "$FILEPREF 0 $DATE INFO/LICENSE"
     fi
@@ -143,8 +137,6 @@ mcrpmfs_copyout ()
 	INFO/PACKAGER)		$RPM -q --qf "%{PACKAGER}\n" -- "$1" > "$3"; exit 0;;
 	INFO/URL)		$RPM -q --qf "%{URL}\n" -- "$1" > "$3"; exit 0;;
 	INFO/BUILDTIME)		$RPM -q --qf "%{BUILDTIME:date}\n" -- "$1" > "$3"; exit 0;;
-	INFO/SERIAL)		$RPM -q --qf "%{SERIAL}\n" -- "$1" > "$3"; exit 0;;
-	INFO/COPYRIGHT)		$RPM -q --qf "%{COPYRIGHT}\n" -- "$1" > "$3"; exit 0;;
 	INFO/EPOCH)		$RPM -q --qf "%{EPOCH}\n" -- "$1" > "$3"; exit 0;;
 	INFO/LICENSE)		$RPM -q --qf "%{LICENSE}\n" -- "$1" > "$3"; exit 0;;
 	INFO/RPMVERSION)	$RPM -q --qf "%{RPMVERSION}\n" -- "$1" > "$3"; exit 0;;

-- 
Midnight Commander Development



More information about the mc-devel mailing list