| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | doc/index.txt | 3 | ||||
| -rw-r--r-- | doc/makepkg.conf.5.txt | 2 | ||||
| -rw-r--r-- | lib/libalpm/util.c | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 16 | ||||
| -rw-r--r-- | scripts/po/fi.po | 14 | ||||
| -rw-r--r-- | src/pacman/po/fi.po | 8 | ||||
| -rw-r--r-- | test/pacman/tests/sync303.py | 38 | ||||
| -rw-r--r-- | test/pacman/tests/sync304.py | 27 |
diff --git a/doc/index.txt b/doc/index.txt index 359b47fa..c36dfbf2 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -71,7 +71,8 @@ Releases [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date -!4.0.0 !2011-09-13 +!4.0.1 !2011-11-20 +!4.0.0 !2011-10-13 !4.0.0rc2 !2011-09-22 !4.0.0rc1 !2011-08-11 !3.5.4 !2011-08-10 diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 2778361b..db1e6d53 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -215,7 +215,7 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and + current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and `.tar.Z`. Do not touch these unless you know what you are doing. diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 74c9740c..d85a5036 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -700,7 +700,7 @@ int _alpm_ldconfig(alpm_handle_t *handle) snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root); if(access(line, X_OK) == 0) { char *argv[] = { "ldconfig", NULL }; - _alpm_run_chroot(handle, "/sbin/ldconfig", argv); + return _alpm_run_chroot(handle, "/sbin/ldconfig", argv); } } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 26a27899..0fa05dcb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,15 +506,17 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}")) ]]; then - warning "$(gettext "Failed to remove installed dependencies.")" - return 0 + if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ + <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 fi - local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}"))) - (( ${#deplist[@]} == 0 )) && return + local deplist + if ! deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}"))); then + return + fi msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully diff --git a/scripts/po/fi.po b/scripts/po/fi.po index 9e42e945..27aabc87 100644 --- a/scripts/po/fi.po +++ b/scripts/po/fi.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n" -"PO-Revision-Date: 2011-11-14 03:57+0000\n" -"Last-Translator: toofishes <dpmcgee@gmail.com>\n" +"PO-Revision-Date: 2011-11-21 18:29+0000\n" +"Last-Translator: Larso <larso@gmx.com>\n" "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/fi/)\n" "Language: fi\n" @@ -139,16 +139,16 @@ msgid "Skipping all source file integrity checks." msgstr "Ohitetaan lähdetiedostojen virheellisyyden tarkistaminen." msgid "Skipping verification of source file checksums." -msgstr "Lähdetiedostojen tarkastussummia ei tarkasteta." +msgstr "" msgid "Skipping verification of source file PGP signatures." msgstr "Lähdetiedostojen PGP allekirjoituksia ei tarkasteta." msgid "Extracting Sources..." -msgstr "Puretaan lähdetiedostoja..." +msgstr "" msgid "Extracting %s with %s" -msgstr "Lähdetiedostoa %s puretaan ohjelmalla %s" +msgstr "" msgid "Failed to extract %s" msgstr "tiedoston %s purkaminen epäonnistui" @@ -487,10 +487,10 @@ msgid "%s signal caught. Exiting..." msgstr "%s signaali vastaanotettu. Lopetetaan..." msgid "Aborted by user! Exiting..." -msgstr "" +msgstr "Käyttäjä keskeytti. Lopetetaan..." msgid "An unknown error has occurred. Exiting..." -msgstr "" +msgstr "Tapahtui tuntematon virhe. Lopetetaan..." msgid "%s not found." msgstr "%s löytyi." diff --git a/src/pacman/po/fi.po b/src/pacman/po/fi.po index 28ddb085..ecc9939a 100644 --- a/src/pacman/po/fi.po +++ b/src/pacman/po/fi.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n" -"PO-Revision-Date: 2011-11-14 03:57+0000\n" -"Last-Translator: toofishes <dpmcgee@gmail.com>\n" +"PO-Revision-Date: 2011-11-21 17:16+0000\n" +"Last-Translator: Larso <larso@gmx.com>\n" "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/fi/)\n" "Language: fi\n" @@ -1178,11 +1178,11 @@ msgstr "Pakettivarasto %s\n" #, c-format msgid "invalid value: %d is not between %d and %d\n" -msgstr "" +msgstr "virheellinen arvo: %d ei ole arvojen %d ja %d välillä\n" #, c-format msgid "invalid number: %s\n" -msgstr "" +msgstr "virheellinen luku: %s\n" #, c-format msgid "Enter a selection (default=all)" diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py new file mode 100644 index 00000000..b717dd2c --- /dev/null +++ b/test/pacman/tests/sync303.py @@ -0,0 +1,38 @@ +self.description = "Sysupgrade: upgrade pacman with deps as provisions" + +sp = pmpkg("pacman", "1.0-2") +sp.depends = ["zlib"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.13-1") +self.addpkg2db("sync", glibcdep) + +zlibdep = pmpkg("zlib", "1.2.5-3") +zlibdep.depends = ["glibc"] +self.addpkg2db("sync", zlibdep) + + +lp = pmpkg("pacman", "1.0-1") +lp.depends = ["zlib"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc-awesome", "2.13-2") +lp2.provides = ["glibc=2.13"] +lp2.conflicts = ["glibc"] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("zlib", "1.2.5-3") +self.addpkg2db("local", lp3) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|1.0-2") +self.addrule("PKG_EXIST=glibc-awesome") +self.addrule("PKG_VERSION=glibc-awesome|2.13-2") +self.addrule("PKG_EXIST=zlib") + +self.expectfailure = True diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py new file mode 100644 index 00000000..4ac1a015 --- /dev/null +++ b/test/pacman/tests/sync304.py @@ -0,0 +1,27 @@ +self.description = "Sysupgrade: upgrade pacman being depended on" + +sp = pmpkg("pacman", "4.0.1-1") +self.addpkg2db("sync", sp) + +sp2 = pmpkg("pyalpm", "2-1") +sp2.depends = ["pacman>=4.0", "pacman<4.1"] +self.addpkg2db("sync", sp2) + +lp = pmpkg("pacman", "3.5.4-1") +self.addpkg2db("local", lp) + +lp2 = pmpkg("pyalpm", "1-1") +lp2.depends = ["pacman>=3.5", "pacman<3.6"] +self.addpkg2db("local", lp2) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-1") +self.addrule("PKG_EXIST=pyalpm") +self.addrule("PKG_VERSION=pyalpm|2-1") + +self.expectfailure = True |