Commit 682e423e authored by Shawn Webb's avatar Shawn Webb
Browse files

Merge remote-tracking branch 'upstream/release-1.14' into hbsd/release/1.14

parents 962ad56d cbb23e5e
Changes from 1.14.6 to 1.14.7
- Fix build with -fno-common
Changes from 1.14.5 to 1.14.6
- Fix linking on FreeBSD
Changes from 1.14.4 to 1.14.5
- Prevent potential hang with lua scripts
- Add a debug message if obtaining the lock fails
......
......@@ -31,6 +31,9 @@ int case_sensitive; /* Case sensitive queries */
int force; /* Forced operation */
int quiet; /* Silent output */
int newpkgversion; /* New package version is available */
int nbactions;
int nbdone;
int nbtodl;
void
set_globals(void)
......@@ -43,5 +46,8 @@ set_globals(void)
force = 0;
quiet = 0;
newpkgversion = 0;
nbactions = 0;
nbdone = 0;
nbtodl = 0;
}
......@@ -37,12 +37,9 @@
extern bool quiet;
extern int nbactions;
int nbactions;
extern int nbdone;
int nbdone;
extern bool newpkgversion;
extern int nbtodl;
int nbtodl;
/* pkg add */
int exec_add(int, char **);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment