diff --git a/PKGBUILD b/PKGBUILD index e58f5c4..a5ff121 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.1.5 +pkgver=2.1.1.7 pkgrel=1 pkgdesc="A basic Python AUR helper/library." arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm' 'python-pyparsing') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('d0ccee2ec58f1573933dcdf22f46cb62') +md5sums=('6dac0fe77ec202a44388e0deb13467c3') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README.rst b/README.rst index 64a68c0..922765a 100644 --- a/README.rst +++ b/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-09-23 -:Version: 2.1.1.1 +:Date: 2011-10-08 +:Version: 2.1.1.7 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/Rakefile b/Rakefile index 4e543bc..ac94821 100644 --- a/Rakefile +++ b/Rakefile @@ -30,12 +30,14 @@ task :prepare, :ver do |t, args| sh "sed \"s/version=.*/version='#{version}',/\" setup.py -i" sh "sed \"s/release = .*/release = '#{version}'/\" docs/conf.py -i" sh "sed \"s/:Version: .*/:Version: #{version}/\" docs/*.rst -i" + sh "sed \"s/:Version: .*/:Version: #{version}/\" README.rst -i" sh "sed \"s/BUILDer .* do/BUILDer #{version} do/\" docs/index.rst -i" sh "sed \"s/VERSION = .*/VERSION = '#{version}'/\" pkgbuilder.py -i" sh "sed \"s/Version .*/Version #{version}/\" pkgbuilder.py -i" sh "sed \"s/pkgver=.*/pkgver=#{version}/\" PKGBUILD -i" sh "sed \"s/:Date: .*/:Date: #{date}/\" docs/*.rst -i" + sh "sed \"s/:Date: .*/:Date: #{date}/\" README.rst -i" end task :docshtml do diff --git a/dist/pkgbuilder-2.1.1.6.tar.gz b/dist/pkgbuilder-2.1.1.6.tar.gz new file mode 100644 index 0000000..00ee8b3 Binary files /dev/null and b/dist/pkgbuilder-2.1.1.6.tar.gz differ diff --git a/dist/pkgbuilder-2.1.1.7.tar.gz b/dist/pkgbuilder-2.1.1.7.tar.gz new file mode 100644 index 0000000..ac41da0 Binary files /dev/null and b/dist/pkgbuilder-2.1.1.7.tar.gz differ diff --git a/docs/README.rst b/docs/README.rst index 3bfdf55..922765a 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/_build/doctrees/README.doctree b/docs/_build/doctrees/README.doctree index 6196c00..07af82f 100644 Binary files a/docs/_build/doctrees/README.doctree and b/docs/_build/doctrees/README.doctree differ diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle index 24f6d1b..4a187d7 100644 Binary files a/docs/_build/doctrees/environment.pickle and b/docs/_build/doctrees/environment.pickle differ diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree index 07f974c..a7aed01 100644 Binary files a/docs/_build/doctrees/index.doctree and b/docs/_build/doctrees/index.doctree differ diff --git a/docs/_build/doctrees/messagecodes.doctree b/docs/_build/doctrees/messagecodes.doctree index d9aa695..2f47f48 100644 Binary files a/docs/_build/doctrees/messagecodes.doctree and b/docs/_build/doctrees/messagecodes.doctree differ diff --git a/docs/_build/doctrees/pkgbuilder.doctree b/docs/_build/doctrees/pkgbuilder.doctree index 4f867c1..432c7a2 100644 Binary files a/docs/_build/doctrees/pkgbuilder.doctree and b/docs/_build/doctrees/pkgbuilder.doctree differ diff --git a/docs/conf.py b/docs/conf.py index c575b6e..edb639f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.1.5' +release = '2.1.1.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/docs-pkgbuilder.zip b/docs/docs-pkgbuilder.zip index 9b901a9..43725a5 100644 Binary files a/docs/docs-pkgbuilder.zip and b/docs/docs-pkgbuilder.zip differ diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo index c0870ff..17e075e 100644 --- a/docs/html/.buildinfo +++ b/docs/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 62c2cc1fe768304fe7e6cd23a596b6be +config: c2e563bad510920c11042df94ffb63ec tags: fbb0d17656682115ca4d033fb2f83ba1 diff --git a/docs/html/README/index.html b/docs/html/README/index.html index 72e5873..42dbaff 100644 --- a/docs/html/README/index.html +++ b/docs/html/README/index.html @@ -7,13 +7,13 @@ - README for PKGBUILDer — PKGBUILDer v2.1.1.5 documentation + README for PKGBUILDer — PKGBUILDer v2.1.1.7 documentation - - + + @@ -31,12 +31,12 @@

Navigation

@@ -57,7 +57,7 @@

README for PKGBUILDer Date:2011-10-08 -Version:2.1.1.5 +Version:2.1.1.7 @@ -140,7 +140,7 @@

Previous topic

title="previous chapter">PKGBUILDer

Next topic

Appendix B. PKGBUILDer message numbers list

+ title="next chapter">Appendix A. PKGBUILDer message numbers list

© Copyright 2011, Kwpolska. - Last updated on 2011-10-08T10:10:47Z. + Last updated on 2011-10-08T19:10:26Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/_sources/README.txt b/docs/html/_sources/README.txt index 3bfdf55..922765a 100644 --- a/docs/html/_sources/README.txt +++ b/docs/html/_sources/README.txt @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/html/_sources/index.txt b/docs/html/_sources/index.txt index 044e474..03c548f 100644 --- a/docs/html/_sources/index.txt +++ b/docs/html/_sources/index.txt @@ -3,7 +3,7 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -PKGBUILDer 2.1.1.5 documentation +PKGBUILDer 2.1.1.7 documentation ================================ Contents: diff --git a/docs/html/_sources/messagecodes.txt b/docs/html/_sources/messagecodes.txt index c083266..01d898c 100644 --- a/docs/html/_sources/messagecodes.txt +++ b/docs/html/_sources/messagecodes.txt @@ -1,10 +1,10 @@ =========================================== -Appendix B. PKGBUILDer message numbers list +Appendix A. PKGBUILDer message numbers list =========================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the diff --git a/docs/html/_sources/pkgbuilder.txt b/docs/html/_sources/pkgbuilder.txt index ffaef4a..844a406 100644 --- a/docs/html/_sources/pkgbuilder.txt +++ b/docs/html/_sources/pkgbuilder.txt @@ -9,7 +9,7 @@ a Python AUR helper/library :Author: Kwpolska :Copyright: This document has been placed in the public domain. :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -33,19 +33,7 @@ OPERATIONS ========== **-i, --info** - Displays info about *targets*. The format is as follows: - - | Category : AUR category - | Name : package name - | Version : current version - | URL : package URL - | Licenses : package licenses - | Votes : AUR votes - | Out of Date : yes or no - | Maintainer : package owner - | Last Updated : date (pacman's format) - | First Submitted: date (pacman's format) - | Description : the package description + Displays info about **targets** in a fashion similar to pacman. **-s, --search** Searches the AUR for packages with **targets** as the query. diff --git a/docs/html/index.html b/docs/html/index.html index b445eb6..75f5143 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -7,13 +7,13 @@ - PKGBUILDer 2.1.1.5 documentation — PKGBUILDer v2.1.1.5 documentation + PKGBUILDer 2.1.1.7 documentation — PKGBUILDer v2.1.1.7 documentation - + @@ -32,7 +32,7 @@

Navigation

  • next
    • -
  • PKGBUILDer v2.1.1.5 documentation »
    • +
  • PKGBUILDer v2.1.1.7 documentation »
    • @@ -41,8 +41,8 @@

    Navigation

    -
    -

    PKGBUILDer 2.1.1.5 documentation

    +
    +

    PKGBUILDer 2.1.1.7 documentation

    Contents:

    -
  • Appendix B. PKGBUILDer message numbers list
    • © Copyright 2011, Kwpolska. - Last updated on 2011-10-08T10:10:47Z. + Last updated on 2011-10-08T19:10:26Z. Created using Sphinx 1.0.7.
    diff --git a/docs/html/messagecodes/index.html b/docs/html/messagecodes/index.html index b8e30ef..efe4ad8 100644 --- a/docs/html/messagecodes/index.html +++ b/docs/html/messagecodes/index.html @@ -7,13 +7,13 @@ - Appendix B. PKGBUILDer message numbers list — PKGBUILDer v2.1.1.5 documentation + Appendix A. PKGBUILDer message numbers list — PKGBUILDer v2.1.1.7 documentation - + @@ -32,7 +32,7 @@

    Navigation

  • previous
    • -
  • PKGBUILDer v2.1.1.5 documentation »
    • +
  • PKGBUILDer v2.1.1.7 documentation »
    • @@ -41,8 +41,8 @@

    Navigation

    -
    -

    Appendix B. PKGBUILDer message numbers list

    +
    +

    Appendix A. PKGBUILDer message numbers list

    @@ -53,7 +53,7 @@

    Appendix B. PKGBUILDer message numbers list

    - +
    Date:2011-10-08
    Version:2.1.1.5
    Version:2.1.1.7
    @@ -304,7 +304,7 @@

    Errors

    Table Of Contents

    © Copyright 2011, Kwpolska. - Last updated on 2011-10-08T10:10:47Z. + Last updated on 2011-10-08T19:10:26Z. Created using Sphinx 1.0.7.
    diff --git a/docs/html/pkgbuilder/index.html b/docs/html/pkgbuilder/index.html index 4207c3b..454949d 100644 --- a/docs/html/pkgbuilder/index.html +++ b/docs/html/pkgbuilder/index.html @@ -7,13 +7,13 @@ - PKGBUILDer — PKGBUILDer v2.1.1.5 documentation + PKGBUILDer — PKGBUILDer v2.1.1.7 documentation - + - +
    @@ -34,9 +34,9 @@

    Navigation

    next
  • - previous |
    • -
  • PKGBUILDer v2.1.1.5 documentation »
    • +
  • PKGBUILDer v2.1.1.7 documentation »
    • @@ -59,7 +59,7 @@

    a Python AUR helper/libraryDate:2011-10-08 -Version:2.1.1.5 +Version:2.1.1.7 Manual section:8 @@ -84,23 +84,7 @@

    DESCRIPTION

    -i, –info
    -

    Displays info about targets. The format is as follows:

    -
    -
    -
    Category : AUR category
    -
    Name : package name
    -
    Version : current version
    -
    URL : package URL
    -
    Licenses : package licenses
    -
    Votes : AUR votes
    -
    Out of Date : yes or no
    -
    Maintainer : package owner
    -
    Last Updated : date (pacman’s format)
    -
    First Submitted: date (pacman’s format)
    -
    Description : the package description
    -
    -
    -
    +
    Displays info about targets in a fashion similar to pacman.
    -s, –search
    Searches the AUR for packages with targets as the query.
    -u, –sysupgrade
    @@ -178,7 +162,7 @@

    Table Of Contents

    Previous topic

    PKGBUILDer 2.1.1.5 documentation

    + title="previous chapter">PKGBUILDer 2.1.1.7 documentation

    Next topic

    README for PKGBUILDer

    @@ -206,14 +190,14 @@

    Navigation

    next
  • - previous |
    • -
  • PKGBUILDer v2.1.1.5 documentation »
    • +
  • PKGBUILDer v2.1.1.7 documentation »

    • © Copyright 2011, Kwpolska. - Last updated on 2011-10-08T10:10:47Z. + Last updated on 2011-10-08T19:10:26Z. Created using Sphinx 1.0.7.
    diff --git a/docs/html/search/index.html b/docs/html/search/index.html index 0b3d118..f38c95b 100644 --- a/docs/html/search/index.html +++ b/docs/html/search/index.html @@ -7,13 +7,13 @@ - Search — PKGBUILDer v2.1.1.5 documentation + Search — PKGBUILDer v2.1.1.7 documentation - + @@ -34,7 +34,7 @@

    Navigation

    @@ -79,12 +79,12 @@

    Search

    Navigation

    © Copyright 2011, Kwpolska. - Last updated on 2011-10-08T10:10:47Z. + Last updated on 2011-10-08T19:10:26Z. Created using Sphinx 1.0.7.
    diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js index e7e7d9a..5406868 100644 --- a/docs/html/searchindex.js +++ b/docs/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{all:0,code:[0,3,2],queri:2,four:3,follow:[0,2],categori:[1,2,3],iconv:3,procur:0,depend:3,friendli:2,send:2,aur:[0,1,2,3],mispel:3,skip:2,aris:0,neglig:0,introduc:0,merchant:0,digit:3,sourc:0,string:3,util:3,exact:3,err:3,list:[0,1,3],pleas:3,impli:0,direct:0,maintain:[3,2],download:3,compat:[0,2],sub:3,section:2,calcul:3,current:2,delet:3,version:[0,3,2],"new":0,order:3,"public":2,deriv:0,disclaim:0,met:0,modif:0,sinc:2,search:[3,2],prior:0,permit:0,extra:0,modul:[3,2],api:3,instal:[0,3,2],from:[0,3,2],proceed:3,visit:2,perl:0,usr:0,tell:3,more:[0,3,2],desir:3,notic:0,warn:[1,3],appendix:[1,3],particular:0,must:0,none:3,pkgbuild:3,pyalpm:0,work:2,subel:3,can:2,purpos:0,root:3,process:2,accept:2,tarbal:3,occur:3,instead:2,updat:[3,2],product:0,after:3,befor:3,mai:0,data:0,man:0,"short":3,author:[0,3,2],element:3,caus:0,inform:[1,3],bulit:3,juan:3,oper:2,help:3,softwar:0,consent:0,through:3,paramet:[0,2],conjunct:2,group:2,fit:0,makepkg:[3,2],tort:0,mail:2,non:3,good:0,"return":3,thei:2,python:[0,1,2,3],interrupt:0,now:[0,2],nor:[0,3],name:[0,3,2],auto_build:3,refresh:2,each:3,debug:3,found:[3,2],mean:3,domain:2,vote:2,redistribut:0,happen:3,extract:3,event:0,special:[0,2],out:[0,3,2],shown:3,profit:0,content:1,cwd:2,reason:3,theori:0,ask:3,"byte":3,place:2,retain:0,first:[3,2],origin:[0,2],endors:0,arrai:3,number:[1,3],predepcheck:3,date:[0,3,2],instruct:3,wrapper:[0,2],wasn:3,owner:[0,2],stabl:0,script:[3,2],licens:2,system:3,messag:[1,3],too:3,illeg:3,option:2,copi:0,sync:2,github:2,holder:0,than:3,target:2,provid:[0,3,2],charact:3,posit:3,sai:2,ani:[0,3],packag:[0,3,2],substitut:0,need:[0,3],issu:[3,2],built:2,note:0,also:[3,2],without:0,build:[0,3,2],which:[3,2],noth:3,even:0,distribut:0,shall:[0,2],multipli:3,letter:3,phase:2,"class":3,build_runn:3,url:2,doc:0,request:3,doe:3,syntax:2,find:3,copyright:[0,2],explain:3,busi:0,meant:3,hit:3,variou:2,get:3,express:0,pypi:0,repo:2,cannot:3,report:2,liabl:0,requir:3,bad:3,see:2,result:3,reserv:0,correctli:3,someth:3,written:0,pkgbuilder:[0,1,2,3],neither:0,incident:0,last:2,howev:[0,3],contract:0,mani:0,com:2,comment:3,kwpolska:[0,3,2],color:2,exemplari:0,damag:0,liabil:0,addition:2,three:3,been:2,compon:3,much:2,consequenti:0,piconv:3,togeth:3,plain:3,servic:0,"while":3,abov:[0,3],error:[1,3],helper:[0,1,2],readm:[0,1],them:2,synopsi:2,incorrectli:3,perform:3,make:2,shorter:3,binari:0,html:0,decod:3,document:[0,1,2,3],http:2,depcheck:3,user:2,syu:2,techniqu:2,exampl:[3,2],thi:[0,3,2],usual:3,identifi:3,yet:3,add:[0,3],valid:[3,2],input:3,match:3,bin:0,applic:2,advis:0,format:2,read:3,big:0,password:3,python3:0,loss:0,specif:0,makedepend:3,manual:2,nocolor:2,output:3,page:[0,2],right:[0,3],indirect:0,librari:[0,1,2],tmp:2,leap:0,exit:3,condit:0,reproduc:0,thhe:2,refer:[0,3],usag:3,broken:3,promot:0,repositori:3,about:[3,2],materi:0,submitt:3,encod:3,automat:[3,2],warranti:0,contributor:0,your:3,git:2,wai:0,submit:2,avail:0,strict:0,includ:[0,3],forward:0,properli:3,form:0,offer:2,forc:2,bug:2,info:[0,3,2],utf:3,possibl:[0,3,2],whether:0,pacman:[0,3,2],displai:[3,2],limit:0,otherwis:0,problem:3,featur:0,uid:2,dure:3,exist:3,file:[0,3],inf:3,check:[3,2],probabl:3,when:3,field:3,other:[0,3,2],sysupgrad:2,you:[0,3,2],novalid:2,sequenc:3,ansi:2,dropbox:2,outdat:3,directori:2,descript:2,ignor:[3,2],time:3,unicodedecodeerror:3},objtypes:{},titles:["README for PKGBUILDer","PKGBUILDer 2.1.1.5 documentation","PKGBUILDer","Appendix B. PKGBUILDer message numbers list"],objnames:{},filenames:["README","index","pkgbuilder","messagecodes"]}) \ No newline at end of file +Search.setIndex({objects:{},terms:{all:0,code:[0,3,2],queri:2,four:3,follow:0,content:1,iconv:3,procur:0,depend:3,friendli:2,send:2,aur:[0,1,2,3],mispel:3,skip:2,aris:0,neglig:0,introduc:0,merchant:0,digit:3,sourc:0,string:3,util:3,exact:3,pkgbuild:3,list:[0,1,3],pleas:3,impli:0,direct:0,maintain:3,download:3,compat:[0,2],sub:3,section:2,calcul:3,current:2,delet:3,version:[0,3,2],"new":0,order:3,"public":2,deriv:0,disclaim:0,met:0,modif:0,sinc:2,search:[3,2],prior:0,permit:0,extra:0,modul:[3,2],api:3,instal:[0,3,2],from:[0,3,2],proceed:3,visit:2,perl:0,usr:0,tell:3,more:[0,3,2],desir:3,notic:0,warn:[1,3],appendix:[1,3],particular:0,must:0,none:3,err:3,pyalpm:0,work:2,subel:3,can:2,purpos:0,root:3,process:2,accept:2,tarbal:3,occur:3,instead:2,updat:[3,2],product:0,after:3,befor:3,date:[0,3,2],data:0,man:0,github:2,incorrectli:3,element:3,issu:[3,2],inform:[1,3],bulit:3,juan:3,oper:2,help:3,softwar:0,consent:0,through:3,paramet:[0,2],conjunct:2,group:2,fit:0,makepkg:[3,2],tort:0,mail:2,non:3,good:0,"return":3,thei:2,python:[0,1,2,3],interrupt:0,now:[0,2],nor:[0,3],name:[0,3],auto_build:3,refresh:2,each:3,debug:3,found:[3,2],mean:3,domain:2,vote:[],redistribut:0,happen:3,extract:3,event:0,special:[0,2],out:[0,3],shown:3,profit:0,categori:[1,2,3],cwd:2,reason:3,theori:0,ask:3,"byte":3,place:2,retain:0,first:3,origin:[0,2],endors:0,arrai:3,number:[1,3],predepcheck:3,mai:0,instruct:3,wrapper:[0,2],wasn:3,owner:0,stabl:0,script:[3,2],licens:[],system:3,messag:[1,3],too:3,illeg:3,option:2,copi:0,sync:2,"short":3,holder:0,than:3,target:2,provid:[0,3,2],charact:3,posit:3,sai:2,fashion:2,ani:[0,3],packag:[0,3,2],substitut:0,need:[0,3],caus:0,built:2,note:0,also:[3,2],exampl:[3,2],build:[0,3,2],which:[3,2],noth:3,even:0,distribut:0,shall:[0,2],multipli:3,letter:3,phase:2,"class":3,correctli:3,url:[],doc:0,request:3,doe:3,syntax:2,find:3,copyright:[0,2],explain:3,busi:0,meant:3,hit:3,variou:2,get:3,express:0,pypi:0,repo:2,cannot:3,report:2,liabl:0,requir:3,bad:3,see:2,result:3,reserv:0,build_runn:3,someth:3,written:0,pkgbuilder:[0,1,2,3],neither:0,incident:0,last:[],howev:[0,3],contract:0,mani:0,com:2,comment:3,kwpolska:[0,3,2],color:2,exemplari:0,damag:0,liabil:0,addition:2,three:3,been:2,compon:3,much:2,consequenti:0,piconv:3,togeth:3,plain:3,servic:0,"while":3,abov:[0,3],error:[1,3],helper:[0,1,2],readm:[0,1],them:2,synopsi:2,author:[0,3,2],perform:3,make:2,shorter:3,binari:0,html:0,decod:3,document:[0,1,2,3],http:2,depcheck:3,user:2,syu:2,techniqu:2,without:0,thi:[0,3,2],usual:3,identifi:3,yet:3,add:[0,3],other:[0,3,2],input:3,match:3,bin:0,applic:2,advis:0,format:[],read:3,big:0,password:3,python3:0,loss:0,specif:0,makedepend:3,manual:2,nocolor:2,output:3,page:[0,2],right:[0,3],indirect:0,librari:[0,1,2],tmp:2,leap:0,exit:3,condit:0,reproduc:0,thhe:2,refer:[0,3],usag:3,broken:3,promot:0,repositori:3,about:[3,2],materi:0,submitt:3,encod:3,automat:[3,2],warranti:0,contributor:0,your:3,git:2,wai:0,submit:[],avail:0,strict:0,includ:[0,3],forward:0,properli:3,form:0,offer:2,forc:2,bug:2,info:[0,3,2],utf:3,possibl:[0,3,2],whether:0,pacman:[0,3,2],displai:[3,2],limit:0,otherwis:0,problem:3,similar:2,featur:0,uid:2,dure:3,exist:3,file:[0,3],inf:3,check:[3,2],probabl:3,when:3,field:3,valid:[3,2],sysupgrad:2,you:[0,3,2],novalid:2,sequenc:3,ansi:2,dropbox:2,outdat:3,directori:2,descript:2,ignor:[3,2],time:3,unicodedecodeerror:3},objtypes:{},titles:["README for PKGBUILDer","PKGBUILDer 2.1.1.7 documentation","PKGBUILDer","Appendix A. PKGBUILDer message numbers list"],objnames:{},filenames:["README","index","pkgbuilder","messagecodes"]}) \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index 044e474..03c548f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -PKGBUILDer 2.1.1.5 documentation +PKGBUILDer 2.1.1.7 documentation ================================ Contents: diff --git a/docs/messagecodes.rst b/docs/messagecodes.rst index c083266..01d898c 100644 --- a/docs/messagecodes.rst +++ b/docs/messagecodes.rst @@ -1,10 +1,10 @@ =========================================== -Appendix B. PKGBUILDer message numbers list +Appendix A. PKGBUILDer message numbers list =========================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 6265146..e311712 100644 Binary files a/docs/pkgbuilder.8.gz and b/docs/pkgbuilder.8.gz differ diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index ffaef4a..844a406 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -9,7 +9,7 @@ a Python AUR helper/library :Author: Kwpolska :Copyright: This document has been placed in the public domain. :Date: 2011-10-08 -:Version: 2.1.1.5 +:Version: 2.1.1.7 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -33,19 +33,7 @@ OPERATIONS ========== **-i, --info** - Displays info about *targets*. The format is as follows: - - | Category : AUR category - | Name : package name - | Version : current version - | URL : package URL - | Licenses : package licenses - | Votes : AUR votes - | Out of Date : yes or no - | Maintainer : package owner - | Last Updated : date (pacman's format) - | First Submitted: date (pacman's format) - | Description : the package description + Displays info about **targets** in a fashion similar to pacman. **-s, --search** Searches the AUR for packages with **targets** as the query. diff --git a/locale/en/LC_MESSAGES/pkgbuilder.po b/locale/en/LC_MESSAGES/pkgbuilder.po index 7332d81..d728404 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 10:25+0100\n" -"PO-Revision-Date: 2011-10-08 10:25+0100\n" +"POT-Creation-Date: 2011-10-08 18:15+0100\n" +"PO-Revision-Date: 2011-10-08 18:15+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" @@ -19,221 +19,227 @@ msgstr "" "X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n" "X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:98 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:100 msgid "WARNING:" msgstr "WARNING:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:105 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:107 msgid "ERROR:" msgstr "ERROR:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:213 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 msgid " [installed: {0}]" msgstr " [installed: {0}]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:217 msgid " [installed]" msgstr " [installed]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:218 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:220 msgid "[out of date]" msgstr "[out of date]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:224 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:227 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:226 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:229 msgid "votes" msgstr "votes" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:261 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:263 msgid "The build function reported a proper build." msgstr "The build function reported a proper build." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:270 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:272 msgid "[ERR3451] validation: NOT installed" msgstr "[ERR3451] validation: NOT installed" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:275 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:277 msgid "[ERR3452] validation: outdated {0}" msgstr "[ERR3452] validation: outdated {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:278 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:280 msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] validation: installed {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:283 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:285 msgid "[ERR3301] makepkg returned 1." msgstr "[ERR3301] makepkg returned 1." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:288 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:290 msgid "[ERR3401] Building more AUR packages is required." msgstr "[ERR3401] Building more AUR packages is required." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:312 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:314 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: 0 bytes downloaded" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:327 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:329 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: no files extracted" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:405 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:456 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:410 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:461 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: cannot find {0} anywhere" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:427 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Package {0} not found." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:425 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:430 msgid "Building {0}..." msgstr "Building {0}..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:433 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 msgid "Downloading the tarball..." msgstr "Downloading the tarball..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:436 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:441 msgid "{0} kB downloaded" msgstr "{0} kB downloaded" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 msgid "Extracting..." msgstr "Extracting..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:439 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:444 msgid "{0} files extracted" msgstr "{0} files extracted" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 msgid "Checking dependencies..." msgstr "Checking dependencies..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in system" msgstr "found in system" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in repos" msgstr "found in repos" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:449 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:454 msgid "found in the AUR" msgstr "found in the AUR" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:452 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:457 msgid "none found" msgstr "none found" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:466 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:471 msgid "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" msgstr "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:549 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:554 msgid "Gathering data about packages..." msgstr "Gathering data about packages..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:555 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:560 msgid "{0} upgradeable packages found:" msgstr "{0} upgradeable packages found:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:557 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:562 msgid "there is nothing to do" msgstr "there is nothing to do" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:561 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:566 msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:578 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:583 msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:584 msgid "You can use pacman syntax if you want to." msgstr "You can use pacman syntax if you want to." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:585 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 msgid "packages to build" msgstr "packages to build" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 msgid "don't use colors in output" msgstr "don't use colors in output" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:593 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +msgid "don't check dependencies (may break makepkg)" +msgstr "don't check dependencies (may break makepkg)" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:601 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:603 msgid "don't check if packages were installed after build" msgstr "don't check if packages were installed after build" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:602 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:610 msgid "view package information" msgstr "view package information" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:604 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:612 msgid "search the AUR for matching strings" msgstr "search the AUR for matching strings" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:608 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:616 msgid "upgrade installed AUR packages" msgstr "upgrade installed AUR packages" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636 msgid "Package {0} not found." msgstr "Package {0} not found." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:631 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640 msgid "" -"Category : {0}\n" -"Name : {1}\n" -"URL : {3}\n" -"Licenses : {4}\n" -"Votes : {5}\n" -"Out of Date : {6}\n" -"Maintainer : {7}\n" -"Last Updated : {8}\n" -"First Submitted: {9}\n" -"Description : {10}\n" +"Category : {cat}\n" +"Name : {nme}\n" +"Version : {ver}\n" +"URL : {url}\n" +"Licenses : {lic}\n" +"Votes : {cmv}\n" +"Out of Date : {ood}\n" +"Maintainer : {mnt}\n" +"Last Updated : {upd}\n" +"First Submitted: {fsb}\n" +"Description : {dsc}\n" msgstr "" -"Category : {0}\n" -"Name : {1}\n" -"URL : {3}\n" -"Licenses : {4}\n" -"Votes : {5}\n" -"Out of Date : {6}\n" -"Maintainer : {7}\n" -"Last Updated : {8}\n" -"First Submitted: {9}\n" -"Description : {10}\n" - -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:643 +"Category : {cat}\n" +"Name : {nme}\n" +"Version : {ver}\n" +"URL : {url}\n" +"Licenses : {lic}\n" +"Votes : {cmv}\n" +"Out of Date : {ood}\n" +"Maintainer : {mnt}\n" +"Last Updated : {upd}\n" +"First Submitted: {fsb}\n" +"Description : {dsc}\n" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:658 msgid "yes" msgstr "yes" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:644 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 msgid "no" msgstr "no" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:657 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:674 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] search string too short, API limitation" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:676 msgid "Searching for exact match..." msgstr "Searching for exact match..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:662 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:679 msgid "not found" msgstr "not found" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:665 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:682 msgid "found" msgstr "found" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.po b/locale/pl/LC_MESSAGES/pkgbuilder.po index c63068e..ebf2d8f 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 10:26+0100\n" -"PO-Revision-Date: 2011-10-08 10:26+0100\n" +"POT-Creation-Date: 2011-10-08 18:15+0100\n" +"PO-Revision-Date: 2011-10-08 18:16+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" @@ -19,221 +19,227 @@ msgstr "" "X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n" "X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:98 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:100 msgid "WARNING:" msgstr "UWAGA:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:105 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:107 msgid "ERROR:" msgstr "BŁĄD:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:213 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 msgid " [installed: {0}]" msgstr "[zainstalowano: {0}]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:217 msgid " [installed]" msgstr "[zainstalowano]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:218 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:220 msgid "[out of date]" msgstr "[nieaktualny]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:224 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:227 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:226 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:229 msgid "votes" msgstr "głosów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:261 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:263 msgid "The build function reported a proper build." msgstr "Funkcja budowania paczek powiadomiła o prawidłowym zbudowaniu." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:270 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:272 msgid "[ERR3451] validation: NOT installed" msgstr "[ERR3451] walidacja: NIE zainstalowano" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:275 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:277 msgid "[ERR3452] validation: outdated {0}" msgstr "[ERR3452] walidacja: nieaktualne {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:278 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:280 msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] walidacja: zainstalowane {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:283 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:285 msgid "[ERR3301] makepkg returned 1." msgstr "[ERR3301] makepkg zwrócił 1." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:288 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:290 msgid "[ERR3401] Building more AUR packages is required." msgstr "[ERR3401] Należy zainstalować więcej pakietów z AUR." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:312 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:314 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: ściągnięto 0 bajtów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:327 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:329 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: wypakowano 0 plików" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:405 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:456 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:410 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:461 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: nie można nigdzie znaleźć pakietu {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:427 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Nie znaleziono pakietu {0}." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:425 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:430 msgid "Building {0}..." msgstr "Budowanie {0}..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:433 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 msgid "Downloading the tarball..." msgstr "Ściąganie paczki..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:436 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:441 msgid "{0} kB downloaded" msgstr "ściągnięto {0} kB" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 msgid "Extracting..." msgstr "Wypakowywanie..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:439 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:444 msgid "{0} files extracted" msgstr "wypakowano {0} plików" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 msgid "Checking dependencies..." msgstr "Sprawdzanie zależności..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in system" msgstr "znaleziono w systemie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:449 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:454 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:452 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:457 msgid "none found" msgstr "brak" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:466 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:471 msgid "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" msgstr "[ERR3202] depcheck: UnicodeDecodeError. Nie można przeczytać PKGBUILD. Znajdują się w nim nieprawidłowe znaki UTF-8. Treść błędu: {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:549 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:554 msgid "Gathering data about packages..." msgstr "Zbieranie informacji o pakietach..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:555 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:560 msgid "{0} upgradeable packages found:" msgstr "Znaleziono {0} pakietów do aktualizacji:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:557 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:562 msgid "there is nothing to do" msgstr "nie ma nic do zrobienia" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:561 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:566 msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:578 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:583 msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "AUR helper w pythonie 3. Przyjazny dla wrapperów." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:584 msgid "You can use pacman syntax if you want to." msgstr "Jeśli chcesz, możesz używać składni pacmana." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:585 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 msgid "packages to build" msgstr "pakiety do zbudowania" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 msgid "don't use colors in output" msgstr "nie używa kolorów na wyjściu" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:593 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +msgid "don't check dependencies (may break makepkg)" +msgstr "nie sprawdza zależności (może popsuć makepkg)" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:601 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:603 msgid "don't check if packages were installed after build" msgstr "nie sprawdza czy pakiety zostały zainstalowane po zbudowaniu" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:602 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:610 msgid "view package information" msgstr "wyświetla informację o pakiecie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:604 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:612 msgid "search the AUR for matching strings" msgstr "przeszukuje AUR według pasujących ciągów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:608 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:616 msgid "upgrade installed AUR packages" msgstr "uaktualnia zainstalowane pakiety" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636 msgid "Package {0} not found." msgstr "Nie znaleziono pakietu {0}." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:631 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640 msgid "" -"Category : {0}\n" -"Name : {1}\n" -"URL : {3}\n" -"Licenses : {4}\n" -"Votes : {5}\n" -"Out of Date : {6}\n" -"Maintainer : {7}\n" -"Last Updated : {8}\n" -"First Submitted: {9}\n" -"Description : {10}\n" +"Category : {cat}\n" +"Name : {nme}\n" +"Version : {ver}\n" +"URL : {url}\n" +"Licenses : {lic}\n" +"Votes : {cmv}\n" +"Out of Date : {ood}\n" +"Maintainer : {mnt}\n" +"Last Updated : {upd}\n" +"First Submitted: {fsb}\n" +"Description : {dsc}\n" msgstr "" -"Kategoria : {0}\n" -"Nazwa : {1}\n" -"URL : {3}\n" -"Licencje : {4}\n" -"Głosy : {5}\n" -"Nieaktualny : {6}\n" -"Opiekun : {7}\n" -"Ost. aktualiz. : {8}\n" -"Wysłany : {9}\n" -"Opis : {10}\n" - -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:643 +"Kategoria : {cat}\n" +"Nazwa : {nme}\n" +"Wersja : {ver}\n" +"URL : {url}\n" +"Licencje : {lic}\n" +"Głosy : {cmv}\n" +"Nieaktualny : {ood}\n" +"Opiekun : {mnt}\n" +"Ost. aktualiz. : {upd}\n" +"Wysłany : {fsb}\n" +"Opis : {dsc}\n" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:658 msgid "yes" msgstr "tak" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:644 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 msgid "no" msgstr "nie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:657 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:674 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] ciąg zbyt krótki, limitacja API" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:676 msgid "Searching for exact match..." msgstr "Szukanie dokładnego dopasowania..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:662 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:679 msgid "not found" msgstr "nie znaleziono" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:665 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:682 msgid "found" msgstr "znaleziono" diff --git a/messages.pot b/messages.pot index 9f4d6d4..65004c3 100644 --- a/messages.pot +++ b/messages.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 10:24+0100\n" -"PO-Revision-Date: 2011-10-08 10:24+0100\n" +"POT-Creation-Date: 2011-10-08 18:15+0100\n" +"PO-Revision-Date: 2011-10-08 18:15+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" @@ -19,211 +19,216 @@ msgstr "" "X-Poedit-Basepath: /home/kwpolska/git/pkgbuilder\n" "X-Poedit-SearchPath-0: /home/kwpolska/git/pkgbuilder\n" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:98 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:100 msgid "WARNING:" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:105 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:107 msgid "ERROR:" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:213 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 msgid " [installed: {0}]" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:215 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:217 msgid " [installed]" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:218 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:220 msgid "[out of date]" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:224 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:227 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:226 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:229 msgid "votes" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:261 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:263 msgid "The build function reported a proper build." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:270 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:272 msgid "[ERR3451] validation: NOT installed" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:275 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:277 msgid "[ERR3452] validation: outdated {0}" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:278 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:280 msgid "[INF3450] validation: installed {0}" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:283 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:285 msgid "[ERR3301] makepkg returned 1." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:288 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:290 msgid "[ERR3401] Building more AUR packages is required." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:312 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:314 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:327 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:329 msgid "[ERR3151] extract: no files extracted" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:405 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:456 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:410 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:461 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:422 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:427 msgid "[ERR3001] Package {0} not found." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:425 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:430 msgid "Building {0}..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:433 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 msgid "Downloading the tarball..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:436 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:441 msgid "{0} kB downloaded" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 msgid "Extracting..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:439 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:444 msgid "{0} files extracted" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:443 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 msgid "Checking dependencies..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in system" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:448 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:453 msgid "found in repos" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:449 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:454 msgid "found in the AUR" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:452 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:457 msgid "none found" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:466 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:471 msgid "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:549 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:554 msgid "Gathering data about packages..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:555 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:560 msgid "{0} upgradeable packages found:" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:557 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:562 msgid "there is nothing to do" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:561 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:566 msgid "Proceed with installation? [Y/n] " msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:578 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:583 msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:579 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:584 msgid "You can use pacman syntax if you want to." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:585 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 msgid "packages to build" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:590 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 msgid "don't use colors in output" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:593 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +msgid "don't check dependencies (may break makepkg)" +msgstr "" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:601 msgid "pacman syntax compatiblity" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:595 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:603 msgid "don't check if packages were installed after build" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:598 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:606 msgid "pacman syntax compatiblity" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:602 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:610 msgid "view package information" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:604 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:612 msgid "search the AUR for matching strings" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:608 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:616 msgid "upgrade installed AUR packages" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:627 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:636 msgid "Package {0} not found." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:631 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:640 msgid "" -"Category : {0}\n" -"Name : {1}\n" -"URL : {3}\n" -"Licenses : {4}\n" -"Votes : {5}\n" -"Out of Date : {6}\n" -"Maintainer : {7}\n" -"Last Updated : {8}\n" -"First Submitted: {9}\n" -"Description : {10}\n" -msgstr "" - -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:643 +"Category : {cat}\n" +"Name : {nme}\n" +"Version : {ver}\n" +"URL : {url}\n" +"Licenses : {lic}\n" +"Votes : {cmv}\n" +"Out of Date : {ood}\n" +"Maintainer : {mnt}\n" +"Last Updated : {upd}\n" +"First Submitted: {fsb}\n" +"Description : {dsc}\n" +msgstr "" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:658 msgid "yes" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:644 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 msgid "no" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:657 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:674 msgid "[ERR5002] search string too short, API limitation" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:659 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:676 msgid "Searching for exact match..." msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:662 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:679 msgid "not found" msgstr "" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:665 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:682 msgid "found" msgstr "" diff --git a/pkgbuilder.py b/pkgbuilder.py index c178bc5..2e2bed8 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# PKGBUILDer Version 2.1.1.5 +# PKGBUILDer Version 2.1.1.7 # A Python AUR helper/library. # Copyright Kwpolska 2011. Licensed under GPLv3. # USAGE: ./build.py pkg1 [pkg2] [pkg3] (and more) @@ -18,8 +18,9 @@ import subprocess import datetime import gettext +import functools -VERSION = '2.1.1.5' +VERSION = '2.1.1.7' T = gettext.translation('pkgbuilder', '/usr/share/locale', fallback='en') _ = T.gettext @@ -41,6 +42,7 @@ def __init__(self): } self.pacman = False self.validate = True + self.depcheck = True self.categories = ['E', 'E', 'daemons', 'devel', 'editors', 'emulators', 'games', 'gnome', 'i18n', 'kde', 'lib', 'modules', 'multimedia', 'network', @@ -221,11 +223,11 @@ def print_package(self, pkg, use_categories = True, prefix=''): else: category = 'aur' if prefix == '': - base = prefix+'{0}/{1} {2} ({4} '+_('votes')+'{5}\n'+prefix+'\ + base = prefix+'{0}/{1} {2} ({4} '+_('votes')+'){5}\n'+prefix+'\ {3}' else: - base = prefix+' {0}/{1} {2} ({4} '+_('votes')+'{5}\n'+prefix+'\ - {3}' + base = prefix+' {0}/{1} {2} ({4} '+_('votes')+'){5}\n\ +'+prefix+' {3}' print(base.format(category, pkg['Name'], pkg['Version'], pkg['Description'], pkg['NumVotes'], installed)) @@ -246,7 +248,7 @@ def __init__(self): self.utils = Utils() self.aururl = '{0}://aur.archlinux.org{1}' - def auto_build(self, package, validate): + def auto_build(self, package, validate = True, performdepcheck = True): """ NOT the actual build function. This function makes validation and building AUR deps possible. @@ -255,7 +257,7 @@ def auto_build(self, package, validate): Former data: 2.0 Name: build """ - build_result = self.build_runner(package) + build_result = self.build_runner(package, performdepcheck) try: if build_result[0] == 0: fancy_msg(_('The build function reported a proper build.')) @@ -278,12 +280,12 @@ def auto_build(self, package, validate): fancy_msg2(_('[INF3450] validation: \ installed {0}').format(pkg.version)) pyalpm.release() - elif build_result[0] == 1: + elif build_result[0] >= 0 and build_result[0] <= 15: os.chdir('../') raise PBError(_('[ERR3301] makepkg returned 1.')) # I think that only makepkg can do that. Others would # raise an exception. - elif build_result[0] == 2: + elif build_result[0] == 16: os.chdir('../') fancy_warning(_('[ERR3401] Building more AUR packages is \ required.')) @@ -364,6 +366,7 @@ def depcheck(self, bothdepends): Returns: a dict: key : package name value: -1, 0, 1 or 2 (nowhere, in system, repos, AUR) + or an empty dict Possible exceptions: PBError Suggested way of handling: types = ['system', 'repos', 'aur'] @@ -385,6 +388,8 @@ def depcheck(self, bothdepends): syncpkgs = [] for j in [ i.pkgcache for i in pyalpm.get_syncdbs() ]: syncpkgs.append(j) + syncpgs = functools.reduce(lambda x,y:x+y,syncpkgs) + #can someone help me fix the above line? TODO. for dep in bothdepends: if re.search('[<=>]', dep): vpat = '>=<|><=|=><|=<>|<>=|<=>|>=|=>|><|<>|=<|\ @@ -407,7 +412,7 @@ def depcheck(self, bothdepends): pyalpm.release() return parseddeps - def build_runner(self, package): + def build_runner(self, package, performdepcheck = True): """ A build function, which actually links to others. Do not use it unless you re-implement auto_build. @@ -439,33 +444,33 @@ def build_runner(self, package): fancy_msg2(_('{0} files extracted').format(self.extract( filename))) os.chdir('./'+pkgname+'/') - - fancy_msg(_('Checking dependencies...')) - try: - bothdepends = self.prepare_deps(open('./PKGBUILD', - 'rb').read().decode('utf8', 'ignore')) - deps = self.depcheck(bothdepends) - pkgtypes = [_('found in system'), _('found in repos'), - _('found in the AUR') ] - aurbuild = [] - if deps == {}: - fancy_msg2(_('none found')) - - for pkg, pkgtype in deps.items(): - if pkgtype == -1: - raise PBError(_('[ERR3201] depcheck: cannot find \ -{0} anywhere').format(dep)) - if pkgtype == 2: - aurbuild.append(pkg) - - fancy_msg2('{0}: {1}'.format(pkg, - pkgtypes[pkgtype])) - if aurbuild != []: - return [2, aurbuild] - except UnicodeDecodeError as inst: - fancy_error2(_('[ERR3202] depcheck: UnicodeDecodeError.\ - The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. \ -in the Maintainer field.) Error message: {0}').format(str(inst))) + if performdepcheck == True: + fancy_msg(_('Checking dependencies...')) + try: + bothdepends = self.prepare_deps(open('./PKGBUILD', + 'rb').read().decode('utf8', 'ignore')) + deps = self.depcheck(bothdepends) + pkgtypes = [_('found in system'), _('found in repos'), + _('found in the AUR') ] + aurbuild = [] + if deps == {}: + fancy_msg2(_('none found')) + + for pkg, pkgtype in deps.items(): + if pkgtype == -1: + raise PBError(_('[ERR3201] depcheck: cannot \ +find {0} anywhere').format(dep)) + if pkgtype == 2: + aurbuild.append(pkg) + + fancy_msg2('{0}: {1}'.format(pkg, + pkgtypes[pkgtype])) + if aurbuild != []: + return [16, aurbuild] + except UnicodeDecodeError as inst: + fancy_error2(_('[ERR3202] depcheck: UnicodeDecodeEr\ +ror. The PKGBUILD cannot be read. There are invalid UTF-8 characters (\ +eg. in the Maintainer field.) Error message: {0}').format(str(inst))) asroot = '' if os.geteuid() == 0: @@ -568,7 +573,7 @@ def auto_upgrade(self): pyalpm.release() for package in upgradeable: pblog('Building {0}'.format(package)) - self.build.auto_build(package, DS.validate) + self.build.auto_build(package, DS.validate, DS.depcheck) pblog('Initialized.') @@ -589,6 +594,9 @@ def main_routine(): argopt.add_argument('-C', '--nocolor', action='store_false', default=True, dest='color', help=_('don\'t use \ colors in output')) + argopt.add_argument('-D', '--nodepcheck', action='store_false', + default=True, dest='depcheck', help=_('don\'t \ + check dependencies (may break makepkg)')) argopt.add_argument('-S', '--sync', action='store_true', default=False, dest='pac', help=_('pacman syntax compatiblity')) argopt.add_argument('-V', '--novalidation', action='store_false', @@ -609,6 +617,7 @@ def main_routine(): args = parser.parse_args() DS.validate = args.valid + DS.depcheck = args.depcheck DS.pacman = args.pac try: utils = Utils() @@ -628,25 +637,33 @@ def main_routine(): ipackage)) ### TRANSLATORS: space it properly. `yes/no' below are ### for `out of date'. - print(_("""Category : {0} -Name : {1} -URL : {3} -Licenses : {4} -Votes : {5} -Out of Date : {6} -Maintainer : {7} -Last Updated : {8} -First Submitted: {9} -Description : {10} -""").format(DS.categories[int(ipkg['CategoryID'])], ipkg['Name'], - ipkg['Version'], ipkg['URL'], ipkg['License'], ipkg['NumVotes'], - DS.colors['red']+_('yes')+DS.colors['all_off'] if ( - ipkg['OutOfDate'] == '1') else _('no'), ipkg['Maintainer'], - datetime.datetime.fromtimestamp(float( - ipkg['LastModified'])).strftime('%a %d %b %Y %H:%m:%S %p %Z'), - datetime.datetime.fromtimestamp(float( - ipkg['FirstSubmitted'])).strftime('%a %d %b %Y %H:%m:%S %p \ -%Z'), ipkg['Description'])) + print(_("""Category : {cat} +Name : {nme} +Version 2.1.1.7 +URL : {url} +Licenses : {lic} +Votes : {cmv} +Out of Date : {ood} +Maintainer : {mnt} +Last Updated : {upd} +First Submitted: {fsb} +Description : {dsc} +""").format( + cat = DS.categories[int(ipkg['CategoryID'])], + nme = ipkg['Name'], + url = ipkg['URL'], + ver = ipkg['Version'], + lic = ipkg['License'], + cmv = ipkg['NumVotes'], + ood = DS.colors['red']+_('yes')+DS.colors['all_off'] if ( + ipkg['OutOfDate'] == '1') else _('no'), + mnt = ipkg['Maintainer'], + upd = datetime.datetime.fromtimestamp(float(ipkg['Last\ +Modified'])).strftime('%a %d %b %Y %H:%m:%S %p %Z'), + fsb = datetime.datetime.fromtimestamp(float(ipkg['First\ +Submitted'])).strftime('%a %d %b %Y %H:%m:%S %p %Z'), + dsc = ipkg['Description'])) + exit(0) if args.search == True: @@ -694,7 +711,7 @@ def main_routine(): pblog('Ran through all the addon features, building...') for bpackage in args.pkgs: pblog('Building {0}'.format(bpackage)) - build.auto_build(bpackage, args.valid) + build.auto_build(bpackage, DS.validate, DS.depcheck) pblog('Quitting.') diff --git a/setup.py b/setup.py index 9f0ee59..c6c5c38 100755 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.1.5', + version='2.1.1.7', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk', url='https://github.com/Kwpolska/pkgbuilder', - download_url='https://github.com/Kwpolska/pkgbuilder/tarball/master', license='3-clause BSD', + long_description='A nice AUR helper (and library) written in Python3.', platforms='Arch Linux', classifiers=['Development Status :: 5 - Production/Stable', 'Environment :: Console', @@ -24,9 +24,13 @@ 'Topic :: Utilities' ], py_modules=['pkgbuilder'], + requires=['pyparsing', 'pyalpm'], scripts=['scripts/pkgbuilder'], data_files=[ ('share/man/man8', ['docs/pkgbuilder.8.gz']), - ('share', ['locale']) + ('share/locale/en/LC_MESSAGES', ['locale/en/LC_MESSAGES/\ +pkgbuilder.mo']), + ('share/locale/pl/LC_MESSAGES', ['locale/pl/LC_MESSAGES/\ +pkgbuilder.mo']) ] )