summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--README2
-rw-r--r--contrib/zsh_completion.in8
-rw-r--r--scripts/makepkg.sh.in6
-rwxr-xr-xtest/pacman/pactest.py6
-rw-r--r--test/pacman/pmdb.py2
-rw-r--r--test/pacman/pmenv.py2
-rw-r--r--test/pacman/pmfile.py2
-rw-r--r--test/pacman/pmpkg.py10
-rw-r--r--test/pacman/pmrule.py2
-rw-r--r--test/pacman/pmtest.py4
-rw-r--r--test/pacman/tests/epoch005.py2
-rw-r--r--test/pacman/tests/sync135.py2
-rw-r--r--test/pacman/util.py2
14 files changed, 28 insertions, 28 deletions
diff --git a/NEWS b/NEWS
index 005c789f..8d18236b 100644
--- a/NEWS
+++ b/NEWS
@@ -122,7 +122,7 @@ VERSION DESCRIPTION
- Installing packages with -U can handle installing
dependencies, conflict resolution and replacing packages
(FS#3492, FS#5798)
- - can upgrade the system and install a new package using
+ - can upgrade the system and install a new package using
"pacman -Syu <pkg>" (FS#15581)
- new -D/--database operation for modifying package install
reasons (FS#12950)
@@ -134,7 +134,7 @@ VERSION DESCRIPTION
- allow -Qo to perform a functional 'which' (FS#8798)
- cache cleaning cleans all directories, not just first
- cleanupdelta: new utility to help remove unused deltas from
- a repo database
+ a repo database
- bash completion: rewrite for size and performance (FS#16630)
- repo-add: handle removing the final package from a repo
- rankmirrors: rewrite using bash
@@ -580,7 +580,7 @@ VERSION DESCRIPTION
- Makefile fix for nonstandard lib search paths (Kevin Piche)
- fixed the leftover directories in /tmp
- speed improvement patches from Tommi Rantala
-2.9.2 - bugfix for 2.9.1
+2.9.2 - bugfix for 2.9.1
2.9.1 - --refresh now only downloads fresh packages lists if they've
been updated (currently only works with FTP)
2.9 - Improved -Rs functionality -- pacman now tracks why a package
diff --git a/README b/README
index 0b23019d..d5071a96 100644
--- a/README
+++ b/README
@@ -154,7 +154,7 @@ specified error code into a more friendly sentence, and alpm_strerrorlast()
does the same for the last error encountered (represented by pm_errno).
-[List - alpm_list_t]
+[List - alpm_list_t]
The alpm_list_t structure is a doubly-linked list for use with the libalpm
routines. This type is provided publicly so that frontends are free to use it
diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index 078b507b..f7e0b923 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -116,12 +116,12 @@ _pacman_action_none() {
_pacman_action_query() {
local context state line
typeset -A opt_args
-
+
# _arguments -s : \
# "$_pacman_opts_common[@]" \
# "$_pacman_opts_query_actions[@]" \
# "$_pacman_opts_query_modifiers[@]"
-
+
case $state in
query_file)
_arguments -s : \
@@ -168,12 +168,12 @@ _pacman_action_remove() {
_pacman_action_sync() {
local context state line
typeset -A opt_args
-
+
# _arguments -s : \
# "$_pacman_opts_common[@]" \
# "$_pacman_opts_sync_actions[@]" #\
# #"$_pacman_opts_sync_modifiers[@]"
-
+
case $state in
sync_clean)
_arguments -s : \
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f4640149..e73fdfa6 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -439,8 +439,8 @@ check_deps() {
local ret=0
local pmout
pmout=$(run_pacman -T "$@") || ret=$?
- set -E
-
+ set -E
+
if (( ret == 127 )); then #unresolved deps
echo "$pmout"
elif (( ret )); then
@@ -1531,7 +1531,7 @@ check_sanity() {
done
for i in 'changelog' 'install'; do
- local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
+ local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
local file
for file in $filelist; do
# evaluate any bash variables used
diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py
index 62034dc7..bb198eb4 100755
--- a/test/pacman/pactest.py
+++ b/test/pacman/pactest.py
@@ -3,7 +3,7 @@
# pactest : run automated testing on the pacman binary
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -83,9 +83,9 @@ def create_parser():
help = "do not use --noconfirm for pacman calls")
return parser
-
+
if __name__ == "__main__":
- # instantiate env and parser objects
+ # instantiate env and parser objects
root_path = tempfile.mkdtemp()
env = pmenv.pmenv(root=root_path)
opt_parser = create_parser()
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py
index 5195ec64..b94c6cf6 100644
--- a/test/pacman/pmdb.py
+++ b/test/pacman/pmdb.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py
index e9950fe8..04aecd9a 100644
--- a/test/pacman/pmenv.py
+++ b/test/pacman/pmenv.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/test/pacman/pmfile.py b/test/pacman/pmfile.py
index 638b451e..cdcc7715 100644
--- a/test/pacman/pmfile.py
+++ b/test/pacman/pmfile.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 7aa77f6a..00f345c0 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@ import util
class pmpkg(object):
"""Package object.
-
+
Object holding data from an Arch Linux package.
"""
@@ -79,14 +79,14 @@ class pmpkg(object):
def fullname(self):
"""Long name of a package.
-
+
Returns a string formatted as follows: "pkgname-pkgver".
"""
return "%s-%s" % (self.name, self.version)
def filename(self):
"""File name of a package, including its extension.
-
+
Returns a string formatted as follows: "pkgname-pkgver.PKG_EXT_PKG".
"""
return "%s%s" % (self.fullname(), util.PM_EXT_PKG)
@@ -104,7 +104,7 @@ class pmpkg(object):
def makepkg(self, path):
"""Creates an Arch Linux package archive.
-
+
A package archive is generated in the location 'path', based on the data
from the object.
"""
diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py
index d64f5194..70c8838e 100644
--- a/test/pacman/pmrule.py
+++ b/test/pacman/pmrule.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index 0572d6f0..3acf5d81 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -94,7 +94,7 @@ class pmtest(object):
self.rules = []
self.files = []
self.expectfailure = False
-
+
if os.path.isfile(self.name):
# all tests expect this to be available
from pmpkg import pmpkg
diff --git a/test/pacman/tests/epoch005.py b/test/pacman/tests/epoch005.py
index 4af8edfd..62151703 100644
--- a/test/pacman/tests/epoch005.py
+++ b/test/pacman/tests/epoch005.py
@@ -9,7 +9,7 @@ versions = (
)
pkgvers = [(n, versions[n]) for n in range(len(versions))]
-for k, v in pkgvers:
+for k, v in pkgvers:
sp = pmpkg("pkg_%d" % k, v)
self.addpkg2db("sync", sp)
diff --git a/test/pacman/tests/sync135.py b/test/pacman/tests/sync135.py
index 18c412aa..6e6ccfb1 100644
--- a/test/pacman/tests/sync135.py
+++ b/test/pacman/tests/sync135.py
@@ -27,5 +27,5 @@ self.args = "-Su"
self.addrule("PACMAN_RETCODE=0")
for p in lp1, lp2:
self.addrule("!PKG_EXIST=%s" % p.name)
-for p in sp1, sp2, sp3, sp4:
+for p in sp1, sp2, sp3, sp4:
self.addrule("PKG_EXIST=%s" % p.name)
diff --git a/test/pacman/util.py b/test/pacman/util.py
index 60dea9e8..cde44c6e 100644
--- a/test/pacman/util.py
+++ b/test/pacman/util.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
#
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or