pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: (b)make replace is borken



On Thu, Aug 09, 2007 at 07:42:02AM -0400, Mark E. Perkins wrote:
> I will add that this is recent breakage.  'replace' works as expected on a
> system with pkg_install-20070804 and everything else as above.

I've commited a fix for this. Attached is the patch if you want to try
it before anoncvs gets it.

Joerg
Index: perform.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/info/perform.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- perform.c   8 Aug 2007 22:33:39 -0000       1.33
+++ perform.c   9 Aug 2007 12:53:35 -0000       1.34
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.33 2007/08/08 22:33:39 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.34 2007/08/09 12:53:35 joerg Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 
15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.33 2007/08/08 22:33:39 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.34 2007/08/09 12:53:35 joerg Exp $");
 #endif
 #endif
 
@@ -333,7 +333,7 @@
                if (asprintf(&pattern, "%s-[0-9]*", pkgname) == -1)
                        errx(EXIT_FAILURE, "asprintf failed");
 
-               pkgname = find_best_matching_installed_pkg(pattern);
+               best_installed = find_best_matching_installed_pkg(pattern);
                free(pattern);
        }
 


Home | Main Index | Thread Index | Old Index