Attachment 10822 Details for Bug 21567 – file.diff

[patch] file.diff

file.diff (text/plain), 1.89 KB, created by Peter Pentchev on 2000-09-26 19:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Pentchev

Created: 2000-09-26 19:20:01 UTC

Size: 1.89 KB

patch

obsolete

>diff -urN src/usr.sbin/pkg_install/version/pkg_version.1 mysrc/usr.sbin/pkg_install/version/pkg_version.1
>--- src/usr.sbin/pkg_install/version/pkg_version.1	Wed Sep 20 15:15:53 2000
>+++ mysrc/usr.sbin/pkg_install/version/pkg_version.1	Thu Sep 21 21:15:37 2000
>@@ -32,7 +32,7 @@
> .Nd summarize installed versions of packages
> .Sh SYNOPSIS
> .Nm pkg_version
>-.Op Fl cdhv
>+.Op Fl cdhmv
> .Op Fl l Ar limchar
> .Op Ar index
> .Sh DESCRIPTION
>@@ -93,6 +93,9 @@
> to the shell, it is best to quote
> .Ar limchar
> with single quotes.
>+.It Fl m
>+Even if multiple versions are present, report a match if the installed
>+version is among those in the INDEX.
> .It Fl v
> Enable verbose output.  Verbose output includes some English-text
> interpretations of the version number comparisons, as well as the
>diff -urN src/usr.sbin/pkg_install/version/pkg_version.pl mysrc/usr.sbin/pkg_install/version/pkg_version.pl
>--- src/usr.sbin/pkg_install/version/pkg_version.pl	Wed Sep 20 15:15:53 2000
>+++ mysrc/usr.sbin/pkg_install/version/pkg_version.pl	Thu Sep 21 21:14:07 2000
>@@ -48,6 +48,7 @@
> $VerboseFlag = 0;
> $CommentChar = "#";
> $LimitFlag = "";
>+$MultipleFlag = 0;
> 
> #
> # CompareNumbers
>@@ -206,7 +207,7 @@
> #
> # Parse command-line arguments, deal with them
> #
>-if (!getopts('cdhl:v') || ($opt_h)) {
>+if (!getopts('cdhl:mv') || ($opt_h)) {
>     &PrintHelp();
>     exit;
> }
>@@ -219,6 +220,9 @@
> if ($opt_l) {
>     $LimitFlag = $opt_l;
> }
>+if ($opt_m) {
>+    $MultipleFlag = 1;
>+}
> if ($opt_v) {
>     $VerboseFlag = 1;
> }
>@@ -309,6 +313,17 @@
> 	    $versionCode = "*";
> 	    $Comment = "multiple versions (index has $indexVersion)";
> 	    $Comment =~ s/\|/,/g;
>+
>+	    if ($MultipleFlag) {
>+		@iVer = split(/\|/, $indexVersion);
>+		foreach $ver (@iVer) {
>+		    if (&CompareVersions($currentVersion, $ver) == 0) {
>+			$versionCode = "=";
>+			$Comment = "up-to-date (index has $indexVersion)";
>+			$Comment =~ s/\|/,/g;
>+		    }
>+		}
>+	    }
> 	}
> 	else {

Actions: View | Diff

Attachments on bug 21567: 10822