summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
AgeCommit message (Collapse)AuthorFilesLines
2009-09-20Merge branch 'maint'Dan McGee19-147/+284
Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c
2009-09-20delta : simple code refactoringXavier Chantry1-26/+41
This will make the code re-usable for other purpose. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-20sync.c : duplicate the target before modifying itXavier Chantry2-2/+1
It was probably a bad idea to modify the target directly in case of repo/pkg syntax. Duplicating it also allows us to keep the original target string, which is more informative when printing errors. Also remove a duplicated error message from libalpm, and improve the message already returned to the frontend. $ pacman -S foo/bar before error: repository 'foo' not found error: 'bar': no such repository after error: 'foo/bar': could not find repository for target Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-18Update Italian translationGiovanni Scafora1-17/+19
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Ukrainian translationRoman Kyrylych1-28/+28
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Turkish translationSamed Beyribey1-10/+10
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Spanish translationJuan Pablo González Tognarelli1-18/+22
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Russian translationSergey Tereschenko1-10/+10
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Romanian translationVolodia Macovei1-8/+8
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Kazakh translationBaurzhan Muftakhidinov1-12/+10
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update Hungarian translationNagy Gabor1-9/+9
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-18Update German translationMatthias Gorissen1-11/+12
Signed-off-by: Giovanni Scafora <giovanni@archlinux.org>
2009-09-17Update en_GB translationDan McGee1-12/+12
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-17Update french translationXavier Chantry1-9/+9
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-17Update all pot and po files for 3.3.1 releaseXavier Chantry16-109/+241
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-17String improvementsXavier Chantry3-8/+8
Add more untranslated strings, improve consistency, etc. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-15Catch an untranslated warning in lib/remove.cNagy Gabor1-1/+1
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-15Merge branch 'maint'Dan McGee1-0/+2
2009-09-15Add makepkgopt to be_package.cNagy Gabor1-0/+2
After commit 774c252 the --debug output shows 5-6 "syntax error..." lines for each package. After this patch pacman recognizes makepkgopt as a valid key, but doesn't do anything. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-12Change the interface for target loadingXavier Chantry8-175/+170
-int alpm_trans_sysupgrade(int enable_downgrade); -int alpm_trans_sync(char *target); -int alpm_trans_add(char *target); -int alpm_trans_remove(char *target); +int alpm_sync_sysupgrade(int enable_downgrade); +int alpm_sync_target(char *target); +int alpm_sync_dbtarget(char *db, char *target); +int alpm_add_target(char *target); +int alpm_remove_target(char *target); * functions renaming * add new sync_dbtarget which allows to specify the db * repo/ syntax handling is moved to frontend ( should implement FS#15141) * group handling is moved to backend ( see http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html )
2009-09-09Remove transaction typeXavier Chantry10-454/+335
This basically started with this change : /* Transaction */ struct __pmtrans_t { - pmtranstype_t type; pmtransflag_t flags; pmtransstate_t state; - alpm_list_t *packages; /* list of (pmpkg_t *) */ + alpm_list_t *add; /* list of (pmpkg_t *) */ + alpm_list_t *remove; /* list of (pmpkg_t *) */ And then I have to modify all the code accordingly.
2009-09-09Use sync.c for upgrade transaction prepare and commitNagy Gabor6-149/+56
This patch utilizes the power of sync.c to fix FS#3492 and FS#5798. Now an upgrade transaction is just a sync transaction internally (in alpm), so all sync features are available with -U as well: * conflict resolving * sync dependencies from sync repos * remove unresolvable targets See http://www.archlinux.org/pipermail/pacman-dev/2009-June/008725.html for the concept. We use "mixed" target list, where PKG_FROM_FILE origin indicates local package file, PKG_FROM_CACHE indicates sync package. The front-end can add only one type of packages (depending on transaction type) atm, but if alpm resolves dependencies for -U, we may get a real mixed trans->packages list. _alpm_pkg_free_trans() was modified so that it can handle both target types _alpm_add_prepare() was removed, we use _alpm_sync_prepare() instead _alpm_add_commit() was renamed to _alpm_upgrade_targets() sync.c (and deps.c) was modified slightly to handle mixed target lists, the modifications are straightforward. There is one notable change here: We don't create new upgrade trans in sync.c, we replace the pkgcache entries with the loaded package files in the target list (this is a bit hackish) and call _alpm_upgrade_targets(). This implies a TODO (pkg->origin_data.db is not accessible anymore), but it doesn't hurt anything with pacman front-end, so it will be fixed later (otherwise this patch would be huge). I updated the documentation of -U and I added a new pactest, upgrade090.py, to test the syncdeps feature of -U. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-09Add a new reason field to pmconflict_t structNagy Gabor4-7/+23
Sometimes "foo conflicts with bar" information is not enough, see this thread: http://bbs.archlinux.org/viewtopic.php?id=77647. That's why I added a new reason field to our pmconflict_t struct that stores the packager- defined conflict that induced the fact that package1 conflicts with package2. I modified the front-end (in callback.c, sync.c, upgrade.c) to print this new information as well. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
2009-09-07libalpm/util.c : remove _alpm_strreplaceXavier Chantry2-46/+0
This function is unused since commit 358cc5804a2df873180e6d9ef2420ab3247f8437. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> [Dan: also kill from util.h] Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-06Check package arch before installingXavier Chantry3-0/+36
This implements FS#15622 Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-09-06Add Architecture and --arch optionXavier Chantry3-0/+20
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-19Merge branch 'maint'Dan McGee1-2/+2
Conflicts: lib/libalpm/dload.c
2009-08-19dload.c : various fixesXavier Chantry4-47/+9
- fix one memleak if get_filename failed - cleanup according to Joerg's feedback: "url_for_string: If fetchParseURL returned successful, you should always have a scheme set. The logic for anonftp should only be needed for very broken server -- do you know of any such? download_internal: Specifying 'p' is now a nop -- it is tried by default first with fall-back to active FTP." Signed-off-by: Xavier Chantry <shiningxc@gmail.com> [Dan: remove from pacman.conf and pacman.conf.5] Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-19dload.c : change the way to check for mtimesXavier Chantry1-7/+11
libfetch supports checking mtime so we do not need to do it manually. when the databases are already up-to-date, initiating a connection with fetchXGet and closing it right after with fetchIO_close took a very long time (up to 10min!) on some network. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org> (cherry picked from commit d7675e393ff3cecb5408c243898ebaae80c5988d)
2009-08-14Make fetch timeout actually 10 secondsDan McGee1-2/+2
We had 10000 as our timeout value, assuming it was expressed in ms. This is false after looking at the current code, so reset it back to 10 seconds. Addresses FS#15369. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-08Merge branch 'maint'Dan McGee1-2/+2
2009-08-08dload.c : only call fwrite onceXavier Chantry1-8/+6
I assume the loop was never iterated more than once, because the write location was not updated at each loop iteration (buffer instead of buffer + nwritten), yet we never had reports of corrupted download. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-08dload.c : change the way to check for mtimesXavier Chantry1-7/+11
libfetch supports checking mtime so we do not need to do it manually. when the databases are already up-to-date, initiating a connection with fetchXGet and closing it right after with fetchIO_close took a very long time (up to 10min!) on some network. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-03Add a missing newline.Xavier Chantry1-1/+1
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-03Use full path to ldconfigMarc - A. Dahlhaus1-1/+1
If /sbin is not in the PATH and sudo is used, ldconfig cannot be found. So use /sbin/ldconfig instead. The code checked for the existence of /sbin/ldconfig anyway.. Signed-off-by: Marc - A. Dahlhaus <mad@wol.de> Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-02fix warning when internal download is not usedXavier Chantry1-1/+1
After commit 30c4d53ce5c16cbbb17a88fe1ad14faf53d91999, get_destfile and get_tempfile are only used for internal download, so move these two functions inside the ifdef Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-01Update Brazilian Portuguese translationArmando M. Baratti1-29/+29
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-01French translation reformatDan McGee1-1/+3
'make distcheck' had issues with this one and reformatted it. In addition, it found a fuzzy message which is now fixed due to an inadvertent msgid edit. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-07-31update english british translationJeff Bailes1-23/+23
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-30update hungarian translationNagy Gabor1-66/+21
Thanks to Avramucz Peter <muczyjoe@gmail.com> for having translated all the scripts ! Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-30update simplified chinese translationLu Gan1-23/+23
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-30update russian translationSergey Tereschenko1-86/+88
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-30update ukrainian translationRoman Kyrylych (Роман Кирилич)1-21/+21
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update german translationMatthias Gorissen1-68/+23
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update Kazakh translationBaurzhan Muftakhidinov1-26/+26
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update romanian translationVolodia Macovei1-73/+27
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update polish translationMateusz Herych1-23/+23
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update turkish translationSamed Beyribey1-42/+42
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update czech translationVojtech Gondzala1-24/+24
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-07-29update spanish translationJuan Pablo Gonzalez Tognarelli1-71/+27
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>