155aeb40fd
Spruced up the TODOs a bit, got rid of some of them since a lot of it was
...
duplicate anyway. Also removed the last of the ORE tags and replaced them
with TODOs.
2007-02-07 22:08:37 +00:00
3d07ad9539
Copy/pasta error in alpm_get_upgrades that caused a segfault
2007-02-07 06:19:40 +00:00
cbd516a06e
Only honor 'force' if versions are NOT identical
2007-02-07 06:12:53 +00:00
6c5066471c
Cleanup and more debug info for alpm_pkg_compare_versions
2007-02-07 05:57:28 +00:00
da637c79e5
Oops. Actuall add two new translation templates as requested on the ML-
...
'it' and 'pt_BR'.
2007-02-07 02:24:13 +00:00
f05b6c152b
* Update of all the *.po files and *.pot template files.
...
* Makefile targets to rebuild po files now work - use 'make update-po' in
the po directories.
* Added two new translation templates as requested on the ML- 'it' and
'pt_BR'.
This commit might be a bit big for the mailing list to like on the commit
message. :)
2007-02-07 02:22:53 +00:00
4de804d157
* Makepkg updates, and small bugfix on man page compression.
...
* Change libtool default to makepkg2 behavior.
* Other small changes.
2007-02-06 22:36:13 +00:00
96a0115630
Cleaning up mistakes. :P
2007-02-06 21:28:29 +00:00
79c277a218
Attempt #2 at -S/-Su unification: verify that the 'force' option has been read before comparing versions
2007-02-06 20:57:17 +00:00
7d63ecfac6
Copy-pasta errors. 8)
2007-02-06 17:41:36 +00:00
67ea493ec2
Attempt to unify the -S and -Su version comparissons for when a package is newer
...
See FS#5388
2007-02-06 17:39:32 +00:00
63000584b6
Implemented a crappy version of -Qu (query upgrades). This simply outputs the
...
packages to be upgraded in a -Su operation. Much of the code is duplicated from
sync.c.
TODO: move the implementation to upgrades.c, and reimplement the sync_sysupgrade
function in terms of this:
trans->packages = alpm_get_upgrades();
2007-02-04 08:26:52 +00:00
b2da4b4234
* Added archive verification when loading package metadata for -u and -A
...
operations (now aborts on a corrupt archive)
* Fixed the pm_fprintf newline error that was plaguing us. It seems a line
resetting 'neednl' was removed a while back (by me). This causes all the
output errors we've been seeing
2007-02-04 03:24:32 +00:00
616620ad5c
* Minor output fix (move colon so it's not part of the URL)
...
* Added ldconfig on --sync operations too
2007-02-01 03:31:46 +00:00
21e19a7bcf
Loading package data from a file was ALWAYS generating the filelist, instead of
...
using the in-package one. This is now fixed, and an autogenerated one is used as
a last resort.
This fixes the bug where /.CHANGELOG showed up in -Ql.
2007-02-01 03:00:34 +00:00
a2bd6d105c
Cleaned up some of the metadata control
2007-02-01 02:29:07 +00:00
4cd65c0a31
* !strcmp reads funny (as "not string compare" - switch those to == 0, which has
...
a positive connotation.
* Added a nice TODO
2007-02-01 01:51:12 +00:00
21729f0ce4
* Forgot the int->enum header checkin
...
* Removed the dep-sorting TODO item - switch the sorting to a topological sort
later (I'll let Dan do the CS stuff, heh)
2007-01-31 08:10:01 +00:00
290b962c48
Switched an int to an enum
2007-01-31 07:14:50 +00:00
0adceabe13
Fix corrupt DB entry handling when loading package entries.
...
* scan loops no longer abort on corrupt entries
* reloading a cache package (and discovering it corrupt) no longer prints 2 messages
and uses the pre-build "remove from package cache" function
NOTE: The TODOs in there are important for later w.r.t. cleaning up corrupt DB
entries but there are some logical complexities with doing so, so I'm holding
off for now.
2007-01-31 06:48:06 +00:00
670319c2fb
Debug logging changes:
...
* The --debug params were goofy. New setup allows --debug without params,
--debug=<level> where level 1=debug output, 2=debug and download output,
3=debug, download, and function tracing output. This seems more sane to me.
* Removed PM_LOG_FLOW1 and PM_LOG_FLOW2. They were just confusing. When adding
new functions, it is near impossible to determin if your output should be
"flow1" or "flow2" without tracking all the way up the call chain. Rarely
would one ever say "ok, lets just show "flow2" output. These have both been
replaced with PM_LOG_DEBUG
* Removed the need for the root parameter on alpm_initialize. it is now
defaulted to PM_ROOT just like dbpath and cachedir. This allows alpm to be
initialized BEFORE option parsing in the front end, saving us some duplicate
variables in the frontend.
* Cleaned up front end variables due to early alpm_initialize call.
2007-01-31 06:10:21 +00:00
44dc48f10f
slight line spacing/indent updates
2007-01-31 02:58:12 +00:00
da648bc24c
K. Piche <kevin.piche@cgi.com>
...
* ALPM_LOG_FUNCTION macro and all the great work to add this macro everywhere
2007-01-30 08:14:10 +00:00
195e30e8aa
K. Piche <kpiche@rogers.com>
...
* gcc visiblity changes
Also modified _alpm_versioncmp -> alpm_versioncmp (public function) as per K.
Piche's suggestions
2007-01-30 07:47:19 +00:00
0bc06918e4
* Remove -fno-strict-aliasing as it is now unnecessary to compile.
...
* Fix up add.c a bit better than it was in regards to FS #3492 .
* Optimized the sqrt call in dependency cycle checking to a single call.
* Removal of an outdated comment.
2007-01-30 05:41:13 +00:00
1799afc9c1
Discussed on IRC for a bit, this makes the following changes for clarity:
...
* alpm_list_is_in --> alpm_list_find
* alpm_list_is_strin --> alpm_list_find_str
* Flip parameters of both functions to be inline with rest of alpm_list.
First commit, woohoo.
2007-01-30 03:46:33 +00:00
13f9fc4d19
* Fix building outside $(srcdir).
...
* Removed ./gen-mirrorlist.sh invocation from configure script:
Mirror-files are generated by make, not configure.
2007-01-29 22:18:31 +00:00
e22336673a
Dan McGee <dpmcgee@gmail.com>
...
* Lots of code cleanup, and type fixes
* Make 'makeworld' a bit more in-line with the other stuff
* Make -Si and -Qi operations appear the same
2007-01-26 02:13:16 +00:00
a5ad2b3f93
* Fix FS #3107- Use ISO date style
...
* Fix FS #5409- document that pacman.conf repo ordering is important
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
2007-01-26 01:33:03 +00:00
170d63190a
* Shuffled some of the alpm_list free funtions - still not perfect, but better
...
* Added alpm_list_remove_node for single list node removal
* Proper error checking/output for failed db_read/db_write (missing files)
* Invalid packages (missing files) are now removed from the package cache
* -Qs and -Ss output now look the same
* config.rpath causes errors on one machine I had, so I added it to CVS
* Fixed a "clobbered memory" issue when installing groups - only the outer list
should be free'd, not the contained data
2007-01-24 08:51:50 +00:00
1b61cc8c69
This mainly deals with code clarity- removing currently unneeded
...
optimizations in order to make the code much more readable and
type-checkable. Every enum in the library now has it's own type that
should be used instead of the generic 'unsigned char'. In addition,
several #define statements dealing with constants were converted to
enums.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
2007-01-24 03:02:53 +00:00
8b11dd50eb
James Rosten <seinfeld90@gmail.com>
...
* attempt to unlink file AFTER moving to .pacsave always fails
2007-01-23 16:05:21 +00:00
4db24ca28a
* Added some calloc calls to replace the malloc-then-set-to-zero functionality
...
* Fixed -Ss output so as not to call alpm_list_getdata with a NULl list
* Added a NULL check in alpm_list_getdata
* Fixed alpm_list_add_sorted to properly handle a new / beginning insertions
2007-01-23 01:34:58 +00:00
000256cbc5
* Added a check for .FILELIST for package validity in addition to .PKGINFO
2007-01-22 16:16:51 +00:00
c19839695b
Introduced an infinite loop during the pmlist -> alpm_list transition, whoops
2007-01-22 09:27:00 +00:00
35a9f3e7d0
Moved some decls to make the "pkg_invalid" patch compile again.
2007-01-19 23:44:50 +00:00
77f6bcfa3d
Whoops. There's a 0 where there should be a 1.
2007-01-19 18:06:37 +00:00
d27e5efec9
Johannes Weiner <hannes@saeurebad.de>
...
* package cleanup (pkg_invalid) refactoring
2007-01-19 18:05:19 +00:00
e310209296
Johannes Weiner <hannes@saeurebad.de>
...
* use calloc to zero-out new packages (far more ideal)
* use memcpy to copy primatives when copying package structures
2007-01-19 18:01:02 +00:00
6167017264
Preliminary checkin for alpm_list conversion
...
* renamed pmlist_t -> alpm_list_t
* made alpm_list_t a public type (alpm_list.h header)
* removed additional storage for registered DBs in pacman source
* some code cleanup
* removed duplicate (pm)list_display functions from pacman source
* misc code cleanup
2007-01-19 09:28:44 +00:00
37b83a7401
Some confusion with variable names in unlink_file caused unlink to try and find the _relative_ file instead of absolute. The absolute path name has also been used in some of the output there too.
2007-01-18 17:04:25 +00:00
86b136bb59
Dan McGee <dpmcgee@gmail.com>
...
* Removed some unnecessary headers and library links
* Made things static if possible
* Cleaned up makefiles a bit
* Fixed some old comments in the code
* Fixed some errors the static code checker splint pointed out
* Backwards arguments in a memset call in _alpm_db_read (could have been worse)
* Other various small fixes
Other:
* Default to 80 columns when getcols cannot determine display width
* Removal of ._install as a valid install file in packages
2007-01-18 16:52:57 +00:00
46e26ac5c8
Dan McGee <dpmcgee@gmail.com>
...
* fix "warning: dereferencing type-punned pointer will break strict-aliasing rules"
2007-01-18 16:09:34 +00:00
f6a76dac12
Added strerror() output on unlink failure
2007-01-18 16:04:05 +00:00
1bea7706ae
* Misc logging changes
...
Addition of a forced fflush in an attempt to diagnose mutli-logging
Removal of varargs from the internal logaction function, they are handled in
alpm_logaction just fine
2007-01-17 07:21:07 +00:00
803f92b6a6
James Rosten <seinfeld90@gmail.com>
...
* _alpm_remove_commit refactoring
* clean up/fixes by Dan McGee <dpmcgee@gmail.com>
2007-01-17 04:47:19 +00:00
726e90dc2c
Jürgen Hötzel <juergen@hoetzel.info>
...
* avoid repeated regex compilations (regex for search string do not
change while scanning the package database)
* remove needless string duplication (regex function do not change target
string nor free them)
* code cleanup
This patch improves search performance:
bash-3.2$ time ./src/pacman/pacman.static.old -Ss "(database|web).*server" >/dev/null
real 0m1.026s
user 0m0.544s
sys 0m0.208s
bash-3.2$ time ./src/pacman/pacman.static -Ss "(database|web).*server" >/dev/null
real 0m0.777s
user 0m0.456s
sys 0m0.128s
bash-3.2$
2007-01-17 03:57:53 +00:00
42f8b8b2d3
cvsignore cleanup and additions
2007-01-17 03:40:08 +00:00
2a457c5319
* Jrgen Htzel <juergen@hoetzel.info>
...
_alpm_db_load_pkgcache: use mergesort to improve performance
2007-01-11 17:44:39 +00:00
244fb2a264
* Dan McGee <dpmcgee@gmail.com>
...
Documentation cleanup
2007-01-11 17:32:49 +00:00
043a49701f
* bug fix FS#6100 - fix --print-uris output
2007-01-03 08:05:13 +00:00
50030f778a
* Bug fix FS#6058
...
properly remove entries from "Required By" instead of wiping it out entirely
2007-01-03 06:13:08 +00:00
61d03cc345
* Missing error label in sync.c
...
* Additional debug output for db_write
2007-01-02 22:29:48 +00:00
07c1309009
* Removed latest fix from TODO.autoconf
...
* Attempted fix for FS#6100 - "-Spd foo" failure
* Beginning of refactoring from Dan McGee <dpmcgee@gmail.com>
2006-12-29 17:04:58 +00:00
e3aace4a4d
Cleanup from Dan McGee <dpmcgee@gmail.com> and Jürgen Hötzel <juergen@hoetzel.info>
...
* configure swig check
* misc libalpm cleanup
2006-12-22 19:38:55 +00:00
796490546e
* Properly fix the NoUpgrade issues.
2006-12-22 06:07:33 +00:00
2a89808667
* Unused variable 'path'
2006-12-22 04:47:36 +00:00
77b4d0d013
*untested* potential fix for the NoUpgrade issues.
2006-12-21 18:04:49 +00:00
74e347f09b
* modeline fixes / reformatting
...
* formatting / indentation fixes
* makepkg:
Dan McGee <dpmcgee@gmail.com> - integrity check fix
Jürgen Hötzel <juergen@hoetzel.info> - EUID usage and "x$foo" check revamp
2006-12-21 01:53:40 +00:00
b308f06a3a
* Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html
...
* configure fixes (CFLAGS)
* no-strict-aliasing hacks until full C99 compliance
* --with-config-file configure option
2006-12-14 05:23:08 +00:00
2116ce78fb
Corrected -Rsc operation - dependancy info was not being read from the DB
2006-12-05 07:00:22 +00:00
4488058900
* Fixed the bug where -R pkgA pkgB failed when pkgA depended on pkgB
2006-12-01 09:51:54 +00:00
08dca1593f
* Cosmetic changes and typo fixes
...
* IgnorePkg and --ignore work again
* Partial changes to support removal of conflicts for -U and -A (INCOMPLETE)
2006-12-01 09:32:29 +00:00
9918d43ab9
* Fixed some error output for "-Sd" and "-Rsc" dealing with missing/ignored
...
depends
* Added valgrind suppression file
2006-11-24 07:01:27 +00:00
8da03650b0
* Whoops util Makefile
...
* Slight modification to depcmp debug output
2006-11-22 20:03:52 +00:00
986409f9bd
* Completed getinfo api changes (pmmissing_t, pmtrans_t, etc)
...
* Modified some dependancy checking
* Changed "performing local database upgrade" message to be more clear
* Change 'usize' to 'isize' in database files
* Scriptlet output is now sent to pacman's log file
* Limited some debugging output to be more clear
2006-11-22 09:03:41 +00:00
3c7f616805
* Fixed an error when trying to download to an unwritable location
2006-11-22 04:25:31 +00:00
aa1c0ba9f8
* repo-add script - to add entries to a db file directly from package data (no PKGBUILD)
...
* libalpm api changes - move from a _getinfo(p, WHAT_WE_WANT) scheme to a
typesafe _get_what_we_want(p) scheme [not 100% complete yet]
* some const correctness changes
* removal of PM_* types in alpm.h in favor of the pm*_t types used throughout
libalpm
2006-11-20 09:10:23 +00:00
3d6242ed74
* makepkg.conf.in variable changes (missed the checkin)
...
* Better error reporting when unpacking an archive fails
* Fixed -Sc and -Scc cache dir opening/reading
2006-11-16 17:24:41 +00:00
00ce9ea739
* Initial changes to gensync - makepkg changes were not checked in from another
...
machine - still pending
* Addition of _alpm_pkg_makefilename to simplify the with/without -ARCH prefix
scheme we're going with for the interim
2006-11-15 07:50:37 +00:00
7d6161ccc3
* has_archname changes
...
* makepkg attempt at multiple file integrity checks
* honor "force" option on -S packages (not just -Su)
2006-11-14 17:26:19 +00:00
4470e5ce01
* Numerous mini valgrind fixes.
...
* Addition of hacky architecture check in the _splitname function
* Removal of libfetch from the archlinux proper - it has been renamed to
libdownload and can be found at http://phraktured.net/libdownload
* Merge of _some_ of the Frugalware makepkg change - this may still be
incomplete
* Removal of libftp from cvs proper
* PKGBUILD manpage now says 'PKGBUILD' instead of FrugalBuild (he he)
2006-11-14 07:58:42 +00:00
3e608e7e85
* Improved mcheck output
...
* Added minor libalpm const correctness
* Mini-memory fixes
2006-11-08 08:14:29 +00:00
55f178c629
* Fixed an error message that should be a debug message
...
* Fixed "the big segfault" - dbs_sync list was being modified while iterating
* over the list, big No-No. Now using a while loop over alpm_list_count.
2006-11-08 06:52:50 +00:00
9b4aabdb0f
* Modified some error output and logging
...
* Changed the initial log mask (added PM_LOG_ERROR)
* Fixed -Syu so it now works if any databases were downloaded (it was working
like a -Su)
2006-11-03 03:56:02 +00:00
3bf918dc4e
Fixed pacman -U:
...
* Accidental database read of a file-based package (whoops)
* Proper fetching of url-based -U or -A
Removed some newlines from _alpm_log calls, to make debug output more concise
2006-11-01 06:30:47 +00:00
2930109416
Forgot to cycle to next server on download error - fixed, as well as the
...
erro-case return value of _alpm_downloadfiles_forreal
2006-10-31 07:00:21 +00:00
af2fb3324a
Numerous changes:
...
* Furthered the "lazy caching" to force the pkgcache to read nothing
(INFRQ_NONE) by default. Anything requiring package data should now check
the infolevel of each package and attempt to update it. This could be
ironed out a bit more later (by using the front-end get_info function
* Switched to libfetch. Drastic changes to the download code and the callback
progress bar functions. Also fixed the return value of
_alpm_downloadfiles_forreal. Downloading now supports http, ftp, https, and
files urls, along with 'mtime's and numerous other fancy features from
libfetch.
2006-10-31 06:39:59 +00:00
a4355d8d73
Fri Oct 27 21:54:32 CEST 2006 VMiklos <vmiklos@frugalware.org>
...
* alpm_parse_config(): add missing sanity checks
From: http://darcs.frugalware.org/patches/pacman/20061027195432-e2957-0dcda6bdb2d7516d6a5047185bc14ccdf3fb83fc.patch
2006-10-27 21:15:26 +00:00
e8275fa964
Moved downloaded db unpacking to the backend files, to easier allow conversion
...
from db to whatever format we need.
2006-10-25 18:15:25 +00:00
e21f4c8f2e
Added PM_DLFNM_LEN define, via VMiklos
...
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061023154138-e2957-de4837230b091cbc2136306e1c55a4b79cc72fc8.gz
2006-10-24 04:33:40 +00:00
a719484f1e
Reverted the "out of memory" error to 1 to prevent API changes.
...
This should be changed later, or at least everything fixed up. Typically a 1
return indicates "an error occured" and some functions still might just return
error on failure.
2006-10-21 21:30:43 +00:00
93311212bd
Fixes from frugalware: few 'typos' included while patching
...
Also re-added Judd's dependancy fix in libalpm/deps.c
2006-10-21 20:16:55 +00:00
454cf699a5
More extern moving - keep extern decls in the headers makes for easier/better
...
reuse.
2006-10-21 01:38:59 +00:00
1568fd98d8
Minor changes:
...
* Moved the pmhandle_t extern decl around
* Fixed a doxygen complaint
2006-10-21 01:27:35 +00:00
7131b7ac87
A handful of minor changes:
...
* Removed the PMList typedef, in favor of the same naming scheme other
structs use 'pmlist_t'
* Added a time stamp on debug output, to make it more informational
* Moved alpm_db_register to _alpm_db_register, making the public function
not take a callback parameter
2006-10-20 06:26:55 +00:00
e7f886aac3
From VMiklos <vmiklos@frugalware.org>
...
* alpm_db_update() fix up the level parameter
till now when it was "1", it meant false, which was not in sync with the C logic :)
2006-10-19 15:28:52 +00:00
7e61ca7912
Fixed doxygen comments
2006-10-19 15:11:12 +00:00
cab295b9f5
Yet another "added three times" issue.
2006-10-19 15:05:41 +00:00
b449761a8b
Removed extra includes
2006-10-16 22:25:53 +00:00
6f5bf3fa54
Adjust progress bar to align with frugalware's progressbar
2006-10-16 04:32:15 +00:00
558e49698d
Copyright changes
2006-10-16 00:05:10 +00:00
ac30eb2c1e
Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>
...
for file-conflict progress bar
Also did some CVS cleanup, removing some of the autogenerated files that
shouldn't have been there
2006-10-15 23:54:43 +00:00
42aae4aa7b
Applied changes from frugalware:
...
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz
2006-10-15 23:31:21 +00:00
416d576ced
Another forgotten file set
2006-10-15 22:21:58 +00:00
c4b8798f23
Added sha1 support (for now?)
2006-10-15 22:20:21 +00:00
8f588727fa
Added po files... not sure if this is the right approach
2006-10-15 22:11:52 +00:00
d37ad04873
Merged frugalware changes (too many to list). Also added some config file
...
handling changes (support [sections] to carry over to included files - this
helps with backwards compatibility with existing pacman config files)
2006-10-15 19:31:03 +00:00
cf6da173f6
removed libtar support in favour of libarchive
2006-09-28 20:51:33 +00:00
54008798ef
Patch from FW: Better control over CTRL-C interruptions -- do not leave the DB in an inconsistent state
2006-07-14 23:15:07 +00:00
318e233cb3
spelling fix
2006-07-14 23:11:53 +00:00
ef7cbbb771
bugfix: when looking at provides, defer to the new, to-be-installed package's provisios instead of the the existing package's
2006-07-04 17:48:15 +00:00
7236dd3287
i18n stuff
2006-06-28 05:37:15 +00:00
bb787e26ee
first stage of i18n stuff from VMiklos
2006-05-15 02:19:57 +00:00
3d3a29a808
added .cvsignore files
2006-03-27 17:17:35 +00:00
839a64df41
fixed a regression (patch from VMiklos <vmiklos@frugalware.org>)
2006-03-21 19:38:00 +00:00
ad2c7463c9
put back treename in db->path
2006-03-14 22:53:42 +00:00
a08a9896c9
code cleanup
2006-03-09 19:12:09 +00:00
25571830d6
build be_files.c as a additional object
2006-03-08 20:59:43 +00:00
ddcfaa1f5a
removed an uneeded error code (DB_UPTODATE)
2006-03-08 20:57:03 +00:00
d6eeae2716
code cleanup
2006-03-08 18:21:17 +00:00
4f42a0accb
all _alpm_XXX_cmp functions are now public
2006-03-08 18:07:58 +00:00
230d9d7ae3
db_write: fixed md5sum field
2006-03-07 22:37:01 +00:00
3a08d20b37
removed db_scan calls - take 2
2006-03-07 21:09:16 +00:00
5d7dcdd22c
removed db_scan calls
2006-03-07 21:01:02 +00:00
021bf7b0d0
fixed a commentary
2006-03-07 20:58:09 +00:00
9a6bb4e826
removed an unexpected log
2006-03-07 20:53:24 +00:00
f0151aa587
code cleanup
2006-03-07 20:52:45 +00:00
fa5e6cef75
prepare code for cache loaded with only DEPENDS
2006-03-07 20:45:38 +00:00
8f12ce618c
fixed reason loading if the pkg cache is loaded with DEPENDS only
2006-03-07 18:44:50 +00:00
27be34c09b
added a NOSCRIPLET flag to transactions (patch from VMiklos <vmiklos@frugalware.org>)
2006-03-07 18:17:03 +00:00
1bd8f57a18
- changed flags type from char to int
...
- downloadonly implies FLAG_NOCONFLICTS
2006-03-04 15:33:44 +00:00
297c5284b6
fixed alpm_db_update extraction path
2006-03-04 14:58:28 +00:00
7e9b70a208
added a FLAG_NOCONFLICT
2006-03-04 10:16:36 +00:00
fdc0433d32
added more debug logs
2006-03-04 10:16:12 +00:00
a21b1100e9
make cache works when loading it with DEPENDS info only
2006-03-04 09:42:13 +00:00
dfa1a2a13a
removed HoldPkg option (frontend only feature)
2006-03-02 20:12:11 +00:00
e2faeb46e1
reworked the db object to prepare future integration with different backends
2006-03-02 19:06:52 +00:00
5261c7fafb
code cleanup
2006-03-02 19:04:40 +00:00
3eebe8fc2b
code cleanup
2006-03-02 19:02:35 +00:00
79f4b5acf4
added a debug log
2006-03-02 19:00:57 +00:00
0b4ab2c0a8
added ERROR logs in case of malloc failures (patch from VMiklos <vmiklos@frugalware.org>)
2006-03-01 07:51:00 +00:00
16ff7cfa8e
improved _alpm_list_free handling
2006-02-22 20:49:33 +00:00
3f9ddf262d
skipped conflict resolution for targets removed from transaction set
2006-02-22 19:49:06 +00:00
7706188979
conflict checks: when doing db-vs-target checks, opt to use the NEWER, to-be-installed package instead of the local db version if there's one available
2006-02-21 23:55:59 +00:00
910fd6a687
the library must provide default values for main options
2006-02-20 20:59:35 +00:00
9d4713e2a3
checkmd5sums enhancements
2006-02-20 20:55:53 +00:00
590f610d6b
dropped the MALLOC macro
2006-02-20 20:41:40 +00:00
ef04c832f7
FW: spaces -> tabs cosmetic fix
2006-02-20 18:45:26 +00:00
be39f49a54
prepend library function names with _alpm (helped with the patch from VMiklos <vmiklos@frugalware.org>)
...
added log and event callbacks to sync_commit internal transactions
2006-02-17 22:35:26 +00:00
48cc9f3beb
doxygen support for autotools (patch from Christian Hamar <krics@linuxforum.hu>
2006-02-17 20:48:45 +00:00
a2d1b58210
code cleanup
2006-02-16 23:05:52 +00:00
fbea96fd72
code cleanup
2006-02-16 21:07:59 +00:00
eefe29d99a
fixed directory roots when running scriplets
2006-02-16 21:07:34 +00:00
181efcdeaa
- grep is now a static function
...
- code cleanup
2006-02-16 21:05:49 +00:00
58a7e85534
- db_write: add support to write both local and sync entries
...
- code cleanup
2006-02-16 21:02:39 +00:00
dc0bacf18c
removed a leftover comment
2006-02-15 22:55:54 +00:00
6e76fd8af3
- merged db_open and db_create into one single function
...
- moved the .lastupdate support to the frontend
2006-02-15 22:51:28 +00:00
9cc5e60e6d
reworked logs
2006-02-12 09:43:38 +00:00
2e94c34b05
added a add_faketarget function
...
reworked logs
2006-02-12 09:43:10 +00:00
3997c31ff1
reworked debug messages
2006-02-11 19:06:40 +00:00
8061874991
- reworked debug messages
...
- synchro with pacman 2.9.8
2006-02-11 19:01:56 +00:00
b824ee9608
added more logs
2006-02-11 09:42:52 +00:00
3a82992b59
db_write: only write non-empty fields to database
2006-02-11 07:53:36 +00:00
5aa5142815
error codes cleanup
2006-02-07 22:01:50 +00:00
c5aca9529f
code factorization: take 2
2006-02-07 21:33:09 +00:00
bbb48a85f0
code factorization
2006-02-07 19:08:02 +00:00
f34d895dc5
code cleanup
2006-02-07 18:30:02 +00:00
298c1a8e97
added alpm_pkg_checkmd5sum() to check md5sums for package from the cache
2006-02-05 09:57:29 +00:00
325e3b6b98
added a pmconflict_t structure to handle file conflicts
2006-02-05 09:27:26 +00:00
c432d52506
copyright update
2006-02-05 09:24:28 +00:00
35e23b9554
code cleanup
2006-02-05 09:23:28 +00:00
ad3baca0f4
- sync_prepare: fixed a case where a conflict should be removed from the target list
...
- avoided possible duplicates in target list (patch from VMiklos <vmiklos@frugalware.org>)
- added more debug logs
2006-02-05 09:15:20 +00:00
a167cdb47e
fixed typos in 2 debug logs
2006-02-01 21:59:02 +00:00
54de80b1ea
doxygen support: added @brief field (patch from VMiklos <vmiklos@frugalware.org>)
2006-02-01 17:58:02 +00:00
173d18f3f8
Added a missing trans_release call upon lib shutdown (patch from VMiklos <vmiklos@frugalware.org>)
2006-02-01 06:40:53 +00:00
1042f1e7ce
removed unlock code from alpm_release()
2006-01-29 16:53:16 +00:00
f3c5f9b4d1
Search through package provides if no literal matches are found when scanning for targets with -S
2006-01-28 04:48:51 +00:00
cb96945180
improved log messages for add_commit
2006-01-27 19:21:00 +00:00
c3ffe4367a
cleaned up db_write error cases handling
2006-01-27 19:12:15 +00:00
299d708b0d
fixed potential file descriptor leaks
2006-01-27 19:08:35 +00:00
819c265cdb
fixed a compilation warning
2006-01-26 22:18:07 +00:00
831ff882ae
reworked lock handling (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-26 22:16:57 +00:00
18986b1805
reworked lock handling (patch from VMiklos <vmiklos@frugalware.fr>)
2006-01-26 22:16:57 +00:00
7818e6f745
doxygen comments update (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-26 19:52:47 +00:00
26ec9573ef
changed behaviour with original=X,current=Y,new=Z backup scenario -- install new file as .pacnew and keep old one in place
2006-01-22 02:30:15 +00:00
a10584aec4
document package, group, sync and transaction functions (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-21 19:29:10 +00:00
fc8be93314
resolvedeps: return the depmiss info to the frontend in case of failure
2006-01-21 18:28:38 +00:00
2d08e902ef
added a FAKEROOT define allowing to use pacman in a fakeroot enivronment (for tests purpose)
2006-01-21 16:50:01 +00:00
cf94007aed
more code cleanup yet
2006-01-18 22:37:16 +00:00
c7bcaeb7e8
fixed detection for duplicate entries in list of deps/conflicts
2006-01-17 22:01:57 +00:00
510d57b577
even more code cleanup
2006-01-17 21:18:33 +00:00
719ff509c4
reworked log messages
2006-01-17 21:18:12 +00:00
39b6d552c6
- code cleanup
...
- log improvements
2006-01-17 18:38:31 +00:00
6e5a62dd12
more code cleanup
2006-01-16 22:27:09 +00:00
6dd2ecf4fa
pulled out conflict checkings from checkdeps() in its own function: checkconflicts()
2006-01-15 15:55:16 +00:00
83839f9513
sync_prepare: added a missing chunk of code for dependency checks of packages elected for removal
2006-01-14 15:08:01 +00:00
cb9d23baf8
checkdeps:
...
- merged missing chunks of code from pacman 2.9.7
- more debug logs
2006-01-14 15:05:59 +00:00
aeb0133974
sysupgrade: skip version cmp for pkg elected for removal (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-14 08:14:55 +00:00
d42c6bdc49
removed unuseful error codes
2006-01-13 20:55:39 +00:00
851dd3d16b
improved log and debug messages
2006-01-13 20:46:01 +00:00
1c9041814b
added more doxygen comments (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-11 21:44:11 +00:00
36730a711b
- added 2 more ORE tags (to be reviewed) in the replace/conflict sync code
...
- code cleanup
2006-01-11 12:56:38 +00:00
0938d37b30
fixed an awfull typo
2006-01-11 09:43:40 +00:00
540d3d49b2
code cleanup
2006-01-10 22:08:53 +00:00
1704a00404
fixed a memory leak in the transaction cleanup code
2006-01-10 20:28:27 +00:00
668e58626d
added ALLDEPS transaction flag mainly to handle "makepkg -s"
2006-01-10 18:19:06 +00:00
fd6ce1f4cb
- merged pkg_new and pkg_dummy functions
...
- renamed _alpm_log_action to _alpm_logaction
2006-01-09 20:16:00 +00:00
45a7e57f6c
cleanup
2006-01-08 22:07:31 +00:00
6866b8ce6f
removed old/disable provides-conflict checking code
2006-01-08 22:06:19 +00:00
38180d5231
In the database-against-targets conflict checks, scan db packages' provides
...
fields and look for packages that want to exclusively provide a provisio that
the target package also provides.
2006-01-08 21:58:27 +00:00
77be3f53e9
removed all code related to PM_SYNC_TYPE_DEPEND
2006-01-07 20:05:10 +00:00
86e5c8bc06
sync_commit can now return conflicting files with a trans_prepare like data structure (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-07 18:42:44 +00:00
e405204915
removed a restriction: the data parameter of XXX_prepare functions can be NULL
2006-01-07 18:25:28 +00:00
02694534be
Fixed a regression in the conflict handling code
2006-01-07 18:01:26 +00:00
bde9d69636
added more debug logs in the sync conflict/replace code
2006-01-07 17:59:26 +00:00
74b3e0dcae
removed handle/uid checks (CYGWIN)
2006-01-07 10:03:18 +00:00
f3a4197e34
code cleanup (mainly removed line spaces at the beginning of lines by tabulations)
2006-01-07 09:42:48 +00:00
6c3657b702
removed a misleading PM_ERR_XXX occurrence
2006-01-06 23:26:02 +00:00
db8a5e3586
- sync: populates *data when a conflict can't be resolved
...
- add: code cleanup
2006-01-06 22:58:01 +00:00
c2b27b5880
removed ORE tags (after tests, no real performance increase by implementing them)
2006-01-06 22:35:26 +00:00
45720f32e9
fixed the usage of 4 list_is_in calls (should have been list_is_strin)
2006-01-06 20:47:26 +00:00
2c22045ba8
- fixed a regression with pacman 2.x (reworked patch from VMiklos <vmiklos@frugalware.org>):
...
if pacman is desiganted as a target in a sysupgrade operation, it should be able to upgrade itself first upon user request.
- removed uneeded sanity checks in alpm interface calls
- replaced printf by MSG in pacman
2006-01-06 14:00:03 +00:00
5fc2e009dc
- started to rename list_XXX calls to _alpm_list_XXX
...
- fixed 2 compilation warnings
2006-01-05 21:49:42 +00:00
ef8bbd2ac4
various code cleanup
2006-01-05 21:29:36 +00:00
522b407687
tweaked a log (patch from VMiklos <vmiklos@frugalware.org>)
2006-01-05 20:56:12 +00:00
7858f4c9b4
- fix for sync conflicts (patch from VMiklos <vmiklos@frugalware.org>)
...
- sync code cleanup
- added the deps check for targets to be removed in sync_prepare()
2006-01-05 20:53:41 +00:00
4819d21c74
terminated .lastupdate implementation for HTTP protocol
2006-01-05 19:37:54 +00:00
9ad7b1a4a8
fixed a segfault in removdeps
...
updated removedeps to keep in sync with pacman 2.9.x
2006-01-02 23:13:42 +00:00
f48aced5b2
code cleanup
2006-01-02 21:33:58 +00:00
5839652c41
code cleanup
2006-01-02 20:28:46 +00:00
96de3501ab
patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSION
2006-01-02 19:55:35 +00:00
656a887d35
more sanity checks: do not add or remove databases while a trasaction is running
2006-01-02 16:20:50 +00:00
316cd2b573
code cleanup
2006-01-02 16:20:01 +00:00
db0df44598
code cleanup
2006-01-02 13:26:30 +00:00
cd2daa5189
fixed possible memory corruption
2006-01-02 13:15:08 +00:00
64055e0f74
fixed various memory leaks
2006-01-02 13:14:00 +00:00
d7f4350c29
fixed a typo
2006-01-02 13:01:58 +00:00
d2ce54df86
code cleanup
2006-01-02 12:46:28 +00:00
ee5625ae67
fixed a possible memory leak
2006-01-02 12:19:22 +00:00
07a38db48d
fixed a possible memory corruption
2006-01-02 10:16:27 +00:00
15bc6e5508
removed some overlapping pm_errno assignments
2006-01-01 12:42:33 +00:00
55a76279c5
- fixed a regression with pacman 2.x (patch from VMiklos <vmiklos@frugalware.org>)
...
- code reowrk to ensure the /tmp/alpm_foo directory is always removed
2006-01-01 12:20:36 +00:00
922bab599f
added a debug log when freeing the package cache
2005-12-31 16:54:57 +00:00
7df7ca1738
Allowed C++ usage (patch from VMiklos <vmiklos@frugalware.org>)
2005-12-28 10:38:12 +00:00
a1b005d239
Fixed a typo (spelling) fix (patch from VMiklos <vmiklos@frugalware.org>)
2005-12-28 10:31:23 +00:00
cc1c5b163b
Fixed some logging issues (patch from VMiklos <vmiklos@frugalware.org>)
2005-12-28 10:27:01 +00:00
b062a21d2e
Fixed some memory leaks (patch from Essien Ita Essien <essiene@datavibe.net>)
2005-12-28 10:15:55 +00:00
6bd15469b1
renamed rpmvercmp to versioncmp, added some fixes from isteve@bofh.cz
2005-12-26 16:48:37 +00:00
58c9d5d663
applied first try at sync conflict handling (VMiklos) plus a couple changes
2005-12-26 06:40:29 +00:00
326c66f0ca
patch from VMiklos: regarding the documentation, groups have to be renamed from foo to alpm_foo
2005-12-19 23:32:16 +00:00
f762464630
added Doxyfile
2005-11-21 22:14:32 +00:00
04424f5e89
fixed a file descriptor leak
2005-11-09 21:50:47 +00:00
bf865c2da5
cleanup
2005-11-07 13:01:10 +00:00
fffe7a8ef4
fixed wrong prototype usage for trans_new()
2005-11-07 13:00:22 +00:00
2e559ba431
added a FREESYNC macro to release pointers to pmsyncpkg_t structures
2005-11-07 12:59:29 +00:00
b2df466ffd
fixed compilation warnings
2005-11-07 12:57:33 +00:00
6a2230dce1
added more pm_errnos
2005-11-07 09:43:25 +00:00
414d6d83c9
Used the chroot syscall instead of the chroot binary
...
(patch from Christian Hamaer <krics@linuxforum.hu>)
2005-11-05 19:21:25 +00:00
5d5d7d6339
do not free the cache right before using it!
2005-10-22 08:29:12 +00:00
fa627d4776
bugfix: before searching databases for a dependency, make sure one of the packages in the final list doesn't already provide that dependency
2005-10-21 19:55:24 +00:00
cebc7ace60
fixed a segfault that occured in special cases when propagating requiredby fields during package replacements
2005-10-21 18:53:40 +00:00
69530cd3d9
added INFRQ_DESC back to the package cache so the group cache will work
2005-10-20 20:11:30 +00:00
2b43f98366
added alpm.h to delivery targets (Jason)
2005-10-20 18:57:33 +00:00
1b4ce12672
added patch to use the system memcpy for md5 stuff
2005-10-18 18:47:10 +00:00
a1526a3e7d
added first part of the autoconf stuff - patch from Christian Hamar <krics@linuxforum.hu>
2005-10-17 18:52:43 +00:00
609466fdeb
added PM_OPT_CACHEDIR library option
2005-10-10 20:41:35 +00:00
a7af06ce86
removed a leftover comment
2005-10-10 15:08:36 +00:00
6b7b9787d5
- more sanity checks
...
- alpm_pkg_free can now return an error code
2005-10-10 15:03:35 +00:00
5d61a44759
Fixed EVENT and QUESTION macros
2005-10-10 10:19:02 +00:00
8a53d5a3d7
Fixed missing parameter in trans_init() call
2005-10-10 10:14:13 +00:00
b3450fbe0d
removed debug stmt
2005-10-09 18:48:39 +00:00
586370b744
started some doxygen comment blocks
2005-10-09 07:42:06 +00:00
a36ded25eb
added conversation callback support for transactions
2005-10-09 06:09:57 +00:00
9a4719d3c5
fixed a segfault w/ the skiplist
2005-10-09 04:25:04 +00:00
6f75de92b5
added more error messages, enabled the db permission check in trans_commit
2005-10-08 23:40:49 +00:00
79a20cdc96
Added an error string for lock file creation failure
2005-10-08 22:17:46 +00:00
8ffb82a691
Code update to make use of PKG_FULLNAME_LEN
2005-10-08 21:36:47 +00:00
05ab859eab
Reworked the cache handling to only load DEPENDS info by default
2005-10-08 21:32:14 +00:00
0d6a2edaa8
Moved the REPLACES and FORCE package fields from DESC to DEPENDS db entry
2005-10-08 20:43:25 +00:00
5ef51b3e26
Merging in recent fixes/additions from 2.9.7
2005-10-07 23:29:49 +00:00
79031ccd1a
patch from vmiklos -- properly remove each db entry instead of rmrf'ing the whole thing
2005-10-07 16:38:17 +00:00
543940173d
Added a missing include for CYGWIN target
2005-10-06 07:39:44 +00:00
4ee51bdf46
Added a CYGWIN define to include header files required to build in a Cygwin environment
2005-10-06 07:28:30 +00:00
effbe50ffd
Fixed an error log
2005-10-06 07:24:33 +00:00
af15744967
Applied reworked patch from VMiklos (vmiklos@frugalware.org)
...
Close the lock file descriptor upon handle release
2005-10-05 21:50:58 +00:00
d7e781a54b
Added a PKG_FULLNAME_LEN macro
2005-10-05 20:49:32 +00:00
dacf0eccac
changed license package field to a list
2005-08-20 05:54:45 +00:00
a2192570fb
changed license package field to a list
2005-07-22 01:59:11 +00:00
df5c0392fa
fixed a memory leak with md5 sums handling
2005-05-04 21:22:22 +00:00
de5e40bcd8
code cleanup
2005-05-04 21:21:51 +00:00
0e72c49921
fixed a pointer error
2005-05-04 21:20:43 +00:00
9f1df56353
fixed a typo
2005-05-04 21:06:13 +00:00
3a9a203c46
reordered operations in add_commit (as in pacman 2.9.x)
2005-05-04 21:06:03 +00:00
f78f195235
code cleanup
2005-05-04 20:07:01 +00:00
a2b0748b2b
code cleanup
2005-05-04 20:05:30 +00:00
a26095f8fc
event transaction callback rework to prepare the introduction of a conversation callback
2005-05-04 19:55:23 +00:00
14c8583ccb
code cleanup
2005-05-04 19:52:54 +00:00
a5e4fec74e
fixed a memory leak and avoided to modify a read-only parameter
2005-05-04 19:30:00 +00:00
ce6dcb5159
- fixed a small memory leak
...
- made strverscmp implementation static
2005-05-04 19:28:56 +00:00
f3975acf90
code cleanup
2005-05-03 17:44:53 +00:00
54f6a1cb12
make use of the new list_remove implementation
2005-05-03 17:43:02 +00:00
00b97ee35f
found a possible MLK: to be fixed
2005-05-03 17:42:54 +00:00
80a5ffa8d8
added some debug logs
2005-05-03 17:41:19 +00:00
9177ce7962
reimplemented list_remove to deal with lists of any kind of data
2005-05-03 17:24:20 +00:00
220c084770
moved pkg_cmp() to cache.c
2005-05-03 17:19:19 +00:00
251e52cea7
fixed a small memory leak with md5sums handling
2005-05-03 16:46:18 +00:00
c99a4c85c0
code cleanup
2005-05-02 18:18:27 +00:00
a93521aca3
do not register an already registered db
2005-05-02 17:54:44 +00:00
4b11a9b1ce
code cleanup
2005-05-02 07:50:51 +00:00
2cc81d9eea
code cleanup
2005-05-02 07:42:32 +00:00
0069357006
updated REASON constants to be consistent with databases from pacman 2.9.x
2005-05-02 07:42:18 +00:00
246f9f24a2
removed the extra line feed appended by asctime()
2005-05-02 06:29:59 +00:00
0756af675d
- rework to support pacman_deptest()
...
- code cleanup
2005-05-01 20:46:15 +00:00
beda47fd22
code cleanup
2005-04-24 21:36:30 +00:00
a9540e2c76
fixed potential memory leaks
2005-04-24 21:36:18 +00:00
49257b49f9
avoided to load twice the same target in remove_loadtarget()
2005-04-24 21:27:35 +00:00
7c04fe95ac
added support for the package reason field
2005-04-24 20:11:10 +00:00
90b9888d3a
got ride of an ORE tag in resolvedeps()
2005-04-24 20:06:00 +00:00
11bf5f8b65
some more efficiency in remove_prepare() cascade loop
2005-04-24 20:04:52 +00:00
55704d3742
fixed a commented MLK in db_find_conflicts()/CHECK1
2005-04-24 20:04:26 +00:00
abbb2cfcf0
code cleanup
2005-04-24 18:58:34 +00:00
5a13de80a1
fixed the format of %REASON% entry when writing it
2005-04-24 11:27:35 +00:00
cdd81bf177
- fixed a cut'n'paste bug with %REASON% entry
...
- factorized code between %SIZE% and %CSIZE% reading
2005-04-24 11:24:18 +00:00
85203ff675
use the cache instead of calling db_scan()
2005-04-24 11:17:39 +00:00
95fac9cdb2
code cleanup
2005-04-24 11:15:37 +00:00
2f5060e439
logs cleanup
2005-04-24 11:15:27 +00:00
bcd41a4a3d
removed deprecated comments in add_commit()
2005-04-24 11:14:50 +00:00
e1c7d79ecb
added transaction events for sync_commit operations
2005-04-24 11:14:15 +00:00
45247b4e35
fixed some potential resource leaks
2005-04-24 09:14:25 +00:00
e2b474b130
rework the cache handling to avoid as much as possible calls to db_scan()
2005-04-23 17:18:31 +00:00
348cb923c7
renamed list_is_ptrin() in list_is_in()
2005-04-23 08:28:13 +00:00
4fcec8f03f
first steps to support REPLACES feature
2005-04-20 20:50:49 +00:00
447885fdc3
code beautifying
2005-04-20 20:50:17 +00:00
406f383192
avoided two calls to db_scan() in checkdeps()
2005-04-20 19:46:53 +00:00
b7d584feb6
- fixed args order in list_is_ptrin()
...
- fixed several memory leaks
2005-04-20 19:41:54 +00:00
49d2cdc2f9
fixed args order in list_is_ptrin()
2005-04-20 19:41:33 +00:00
170dd807f5
- fixed args order in list_is_ptrin()
2005-04-20 19:41:22 +00:00
77520f9d43
avoided a call to db_scan()
2005-04-20 19:40:33 +00:00
3ad6393baf
bypass trans_prepare() if there is no target
2005-04-20 19:39:41 +00:00
a215d1ebe0
more work for sync_commit()
2005-04-17 20:09:06 +00:00
cd26093b06
add_loadtarget: load package info only when needed
2005-04-17 10:02:47 +00:00
6dfa3ef6af
improved logs for package removal
2005-04-17 10:01:47 +00:00
cb0182160d
renamed PM_ERR_INVALID_NAME to PM_ERR_PKG_INVALID_NAME
2005-04-17 10:01:22 +00:00
9b64e31286
more sanity checks for pkg_load()
2005-04-17 10:00:49 +00:00
6e5bbdb544
- general cleanup
...
- added alpm_trans_sysupgrade() function
- relocated some defines
2005-04-16 22:23:28 +00:00
36087bb392
- reworked pmsyncpkg_t structure
...
- got ride of uneeded handle external references
2005-04-16 22:15:50 +00:00
29a712e393
- reworked transaction prototypes
...
- added a trans_sysupgrade function
2005-04-16 22:14:34 +00:00
43ea74cce6
reworked handle structure initialization
2005-04-16 16:43:55 +00:00
89f0ccc3cc
reworked transaction prototypes
2005-04-16 16:42:43 +00:00
31da982deb
more work for sync_commit()
2005-04-14 21:07:38 +00:00
c78bcae401
-fixed 2 logs
...
- some sync_commit() rework
2005-04-13 21:01:28 +00:00
2669dfeb60
replaced a call to list_free by the macro FREELIST
2005-04-13 20:00:05 +00:00
e115a5829e
- updated sync feature
...
- added 2 new transaction events
2005-04-13 19:59:04 +00:00
45c7e10afc
updated a log
2005-04-13 19:57:23 +00:00
7775afa59b
added function pkg_splitname (not used for now)
2005-04-08 20:43:13 +00:00
70481b0ee1
reworked alpm_db_readpkg
2005-04-08 20:42:27 +00:00
3e77af5182
more work in sync_prepare
2005-04-08 19:37:23 +00:00
405d3c9a9f
fixed a potential segfault
2005-04-08 19:22:00 +00:00
2decade81f
removed a leftover comment
2005-04-08 17:27:03 +00:00
Dan McGee