1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 11:55:12 -05:00

Fix trailing whitespace in whole codebase

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-17 16:56:07 -05:00
parent b2688e9559
commit 3ceef97799
14 changed files with 28 additions and 28 deletions

6
NEWS
View File

@ -122,7 +122,7 @@ VERSION DESCRIPTION
- Installing packages with -U can handle installing - Installing packages with -U can handle installing
dependencies, conflict resolution and replacing packages dependencies, conflict resolution and replacing packages
(FS#3492, FS#5798) (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) "pacman -Syu <pkg>" (FS#15581)
- new -D/--database operation for modifying package install - new -D/--database operation for modifying package install
reasons (FS#12950) reasons (FS#12950)
@ -134,7 +134,7 @@ VERSION DESCRIPTION
- allow -Qo to perform a functional 'which' (FS#8798) - allow -Qo to perform a functional 'which' (FS#8798)
- cache cleaning cleans all directories, not just first - cache cleaning cleans all directories, not just first
- cleanupdelta: new utility to help remove unused deltas from - cleanupdelta: new utility to help remove unused deltas from
a repo database a repo database
- bash completion: rewrite for size and performance (FS#16630) - bash completion: rewrite for size and performance (FS#16630)
- repo-add: handle removing the final package from a repo - repo-add: handle removing the final package from a repo
- rankmirrors: rewrite using bash - rankmirrors: rewrite using bash
@ -580,7 +580,7 @@ VERSION DESCRIPTION
- Makefile fix for nonstandard lib search paths (Kevin Piche) - Makefile fix for nonstandard lib search paths (Kevin Piche)
- fixed the leftover directories in /tmp - fixed the leftover directories in /tmp
- speed improvement patches from Tommi Rantala - 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 2.9.1 - --refresh now only downloads fresh packages lists if they've
been updated (currently only works with FTP) been updated (currently only works with FTP)
2.9 - Improved -Rs functionality -- pacman now tracks why a package 2.9 - Improved -Rs functionality -- pacman now tracks why a package

2
README
View File

@ -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). 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 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 routines. This type is provided publicly so that frontends are free to use it

View File

@ -116,12 +116,12 @@ _pacman_action_none() {
_pacman_action_query() { _pacman_action_query() {
local context state line local context state line
typeset -A opt_args typeset -A opt_args
# _arguments -s : \ # _arguments -s : \
# "$_pacman_opts_common[@]" \ # "$_pacman_opts_common[@]" \
# "$_pacman_opts_query_actions[@]" \ # "$_pacman_opts_query_actions[@]" \
# "$_pacman_opts_query_modifiers[@]" # "$_pacman_opts_query_modifiers[@]"
case $state in case $state in
query_file) query_file)
_arguments -s : \ _arguments -s : \
@ -168,12 +168,12 @@ _pacman_action_remove() {
_pacman_action_sync() { _pacman_action_sync() {
local context state line local context state line
typeset -A opt_args typeset -A opt_args
# _arguments -s : \ # _arguments -s : \
# "$_pacman_opts_common[@]" \ # "$_pacman_opts_common[@]" \
# "$_pacman_opts_sync_actions[@]" #\ # "$_pacman_opts_sync_actions[@]" #\
# #"$_pacman_opts_sync_modifiers[@]" # #"$_pacman_opts_sync_modifiers[@]"
case $state in case $state in
sync_clean) sync_clean)
_arguments -s : \ _arguments -s : \

View File

@ -439,8 +439,8 @@ check_deps() {
local ret=0 local ret=0
local pmout local pmout
pmout=$(run_pacman -T "$@") || ret=$? pmout=$(run_pacman -T "$@") || ret=$?
set -E set -E
if (( ret == 127 )); then #unresolved deps if (( ret == 127 )); then #unresolved deps
echo "$pmout" echo "$pmout"
elif (( ret )); then elif (( ret )); then
@ -1531,7 +1531,7 @@ check_sanity() {
done done
for i in 'changelog' 'install'; do 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 local file
for file in $filelist; do for file in $filelist; do
# evaluate any bash variables used # evaluate any bash variables used

View File

@ -3,7 +3,7 @@
# pactest : run automated testing on the pacman binary # pactest : run automated testing on the pacman binary
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # 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") help = "do not use --noconfirm for pacman calls")
return parser return parser
if __name__ == "__main__": if __name__ == "__main__":
# instantiate env and parser objects # instantiate env and parser objects
root_path = tempfile.mkdtemp() root_path = tempfile.mkdtemp()
env = pmenv.pmenv(root=root_path) env = pmenv.pmenv(root=root_path)
opt_parser = create_parser() opt_parser = create_parser()

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
@ -27,7 +27,7 @@ import util
class pmpkg(object): class pmpkg(object):
"""Package object. """Package object.
Object holding data from an Arch Linux package. Object holding data from an Arch Linux package.
""" """
@ -79,14 +79,14 @@ class pmpkg(object):
def fullname(self): def fullname(self):
"""Long name of a package. """Long name of a package.
Returns a string formatted as follows: "pkgname-pkgver". Returns a string formatted as follows: "pkgname-pkgver".
""" """
return "%s-%s" % (self.name, self.version) return "%s-%s" % (self.name, self.version)
def filename(self): def filename(self):
"""File name of a package, including its extension. """File name of a package, including its extension.
Returns a string formatted as follows: "pkgname-pkgver.PKG_EXT_PKG". Returns a string formatted as follows: "pkgname-pkgver.PKG_EXT_PKG".
""" """
return "%s%s" % (self.fullname(), util.PM_EXT_PKG) return "%s%s" % (self.fullname(), util.PM_EXT_PKG)
@ -104,7 +104,7 @@ class pmpkg(object):
def makepkg(self, path): def makepkg(self, path):
"""Creates an Arch Linux package archive. """Creates an Arch Linux package archive.
A package archive is generated in the location 'path', based on the data A package archive is generated in the location 'path', based on the data
from the object. from the object.
""" """

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
@ -94,7 +94,7 @@ class pmtest(object):
self.rules = [] self.rules = []
self.files = [] self.files = []
self.expectfailure = False self.expectfailure = False
if os.path.isfile(self.name): if os.path.isfile(self.name):
# all tests expect this to be available # all tests expect this to be available
from pmpkg import pmpkg from pmpkg import pmpkg

View File

@ -9,7 +9,7 @@ versions = (
) )
pkgvers = [(n, versions[n]) for n in range(len(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) sp = pmpkg("pkg_%d" % k, v)
self.addpkg2db("sync", sp) self.addpkg2db("sync", sp)

View File

@ -27,5 +27,5 @@ self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
for p in lp1, lp2: for p in lp1, lp2:
self.addrule("!PKG_EXIST=%s" % p.name) 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) self.addrule("PKG_EXIST=%s" % p.name)

View File

@ -1,7 +1,7 @@
#! /usr/bin/python #! /usr/bin/python
# #
# Copyright (c) 2006 by Aurelien Foret <orelien@chez.com> # Copyright (c) 2006 by Aurelien Foret <orelien@chez.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or