c828143 Add copyright, delete newline from message. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add copyright, delete newline from message.

Matthew Seaman committed 13 years ago

commit c8281433f390334b7be55032e79cbaab16510a2b
parent 1229dd5

1 file changed +2 -1

modified libpkg/pkg_repo.c

@@ -2,6 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2012 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -523,7 +524,7 @@ maybe_delete_conflicting(const char *origin, const char *version,

 		break;
 	case 0:
 	case 1:
 		pkg_emit_error("\nduplicate package origin: package %s is not "
 		pkg_emit_error("duplicate package origin: package %s is not "
 			       "newer than version %s already in repo for "
 			       "origin %s", pkg_path, oversion, origin);
 		ret = EPKG_END;	/* keep what is already in the repo */