diff --git a/TODO b/TODO new file mode 100644 index 0000000..d9fc31b --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +# Conflicts: do not work at all, we should try to solve the problem in a smarter way (without computing the full closed graph) diff --git a/britney.py b/britney.py index 4df9933..1f48670 100644 --- a/britney.py +++ b/britney.py @@ -362,7 +362,7 @@ class Britney: 'architecture': Packages.Section.get('Architecture'), 'rdepends': [], } - for k in ('Pre-Depends', 'Depends', 'Provides'): + for k in ('Pre-Depends', 'Depends', 'Provides', 'Conflicts'): v = Packages.Section.get(k) if v: dpkg[k.lower()] = v @@ -739,7 +739,7 @@ class Britney: packages = [] # for every block of dependency (which is formed as conjunction of disconjunction) - for block, block_txt in map(None, apt_pkg.ParseDepends(binary_u[type_key]), binary_u[type_key].split(',')): + for block, block_txt in zip(apt_pkg.ParseDepends(binary_u[type_key]), binary_u[type_key].split(',')): # if the block is satisfied in testing, then skip the block solved, packages = self.get_dependency_solvers(block, arch, 'testing', excluded) if solved: continue @@ -765,6 +765,7 @@ class Britney: else: excuse.add_break_dep(p, arch) + # otherwise, the package is installable return True # Package analisys methods @@ -899,6 +900,7 @@ class Britney: if not anywrongver and anyworthdoing: excuse.addhtml("Valid candidate") self.excuses.append(excuse) + return True # else if there is something worth doing (but something wrong, too) this package won't be considered elif anyworthdoing: excuse.addhtml("Not considered") @@ -1312,7 +1314,6 @@ class Britney: undo = {'binaries': {}, 'sources': {}} affected = [] - binaries = [] # arch = "/", if "/" in pkg: @@ -1324,6 +1325,7 @@ class Britney: else: if pkg[0] == "-": pkg_name = pkg[1:] + suite = "testing" elif pkg[0].endswith("_tpu"): pkg_name = pkg[:-4] suite = "tpu" @@ -1337,7 +1339,6 @@ class Britney: for p in source['binaries']: binary, arch = p.split("/") undo['binaries'][p] = self.binaries['testing'][arch][0][binary] - binaries.append(p) for j in self.binaries['testing'][arch][0][binary]['rdepends']: if j not in affected: affected.append((j[0], j[1], j[2], arch)) del self.binaries['testing'][arch][0][binary] @@ -1348,15 +1349,17 @@ class Britney: if pkg[0] != "-": source = self.sources[suite][pkg_name] for p in source['binaries']: - if p not in binaries: - binaries.append(p) binary, arch = p.split("/") + if p not in affected: + affected.append((binary, None, None, arch)) + if binary in self.binaries['testing'][arch][0]: + undo['binaries'][p] = self.binaries['testing'][arch][0][binary] self.binaries['testing'][arch][0][binary] = self.binaries[suite][arch][0][binary] for j in self.binaries['testing'][arch][0][binary]['rdepends']: if j not in affected: affected.append((j[0], j[1], j[2], arch)) self.sources['testing'][pkg_name] = self.sources[suite][pkg_name] - return (pkg_name, affected, binaries, undo) + return (pkg_name, suite, affected, undo) def iter_packages(self, packages, output): extra = [] @@ -1369,7 +1372,7 @@ class Britney: better = True nuninst = {} - pkg_name, affected, binaries, undo = self.doop_source(pkg) + pkg_name, suite, affected, undo = self.doop_source(pkg) broken = [] for arch in self.options.architectures: @@ -1379,9 +1382,8 @@ class Britney: for p in filter(lambda x: x[3] == arch, affected): if not self.binaries['testing'][arch][0].has_key(p[0]) or \ - self.binaries['testing'][arch][0][p[0]]['source'] == pkg_name or \ skip_archall and self.binaries['testing'][arch][0][p[0]]['architecture'] == 'all': continue - r = self.excuse_unsat_deps(p[0], None, arch, 'testing', None) + r = self.excuse_unsat_deps(p[0], None, arch, 'testing', None, excluded=[]) if not r and p[0] not in broken: broken.append(p[0]) l = 0 @@ -1390,7 +1392,6 @@ class Britney: for j in broken: for p in self.binaries['testing'][arch][0][j]['rdepends']: if not self.binaries['testing'][arch][0].has_key(p[0]) or \ - self.binaries['testing'][arch][0][p[0]]['source'] == pkg_name or \ skip_archall and self.binaries['testing'][arch][0][p[0]]['architecture'] == 'all': continue r = self.excuse_unsat_deps(p[0], None, arch, 'testing', None, excluded=broken) if not r and p[0] not in broken: broken.append(p[0]) @@ -1422,8 +1423,8 @@ class Britney: # undo the changes (source and new binaries) for k in undo['sources'].keys(): - if k in self.sources['testing']: - for p in self.sources['testing'][k]['binaries']: + if k in self.sources[suite]: + for p in self.sources[suite][k]['binaries']: binary, arch = p.split("/") del self.binaries['testing'][arch][0][binary] del self.sources['testing'][k] diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 2a5252e..539ea4c 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -4,7 +4,7 @@ - +

Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
+doxygen 1.4.7 diff --git a/doc/html/classbritney_1_1Britney-members.html b/doc/html/classbritney_1_1Britney-members.html index 390eb75..c517f5b 100644 --- a/doc/html/classbritney_1_1Britney-members.html +++ b/doc/html/classbritney_1_1Britney-members.html @@ -4,7 +4,7 @@ - +

- r -

- s -

+

- u -

- w -

-
Generated on Sun Jun 25 12:04:03 2006 for briteny by  +
Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
+doxygen 1.4.7
diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html index da75eef..2120b23 100644 --- a/doc/html/functions_func.html +++ b/doc/html/functions_func.html @@ -4,7 +4,7 @@ - +

- a -

+

- d -

- e -

- g -

+: britney.Britney
  • get_nuninst() +: britney.Britney

    - h -

    - i -

    +: britney.Britney
  • iter_packages() +: britney.Britney

    - m -

    @@ -97,11 +103,14 @@ : britney.Britney
  • should_upgrade_src() : britney.Britney
  • should_upgrade_srcarch() : britney.Britney +

    - u -

    - w -

    -
    Generated on Sun Jun 25 12:04:03 2006 for briteny by  +
    Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
    +doxygen 1.4.7
    diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index c0b3160..c63c714 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -4,7 +4,7 @@ - +
    +
    Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
    +doxygen 1.4.7
    diff --git a/doc/html/index.html b/doc/html/index.html index e8c774f..ac650d5 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -4,7 +4,7 @@ - +

    briteny Documentation

    -

    2.0.alpha1


    Generated on Sun Jun 25 12:04:03 2006 for briteny by  +

    2.0.alpha1


    Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
    +doxygen 1.4.7
    diff --git a/doc/html/namespacebritney.html b/doc/html/namespacebritney.html index bf945f3..d97eb82 100644 --- a/doc/html/namespacebritney.html +++ b/doc/html/namespacebritney.html @@ -4,7 +4,7 @@ - +
    • Main Page
    • @@ -20,8 +20,8 @@ class  Britney -
      Generated on Sun Jun 25 12:04:03 2006 for briteny by  +
      Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
      +doxygen 1.4.7
      diff --git a/doc/html/namespaceexcuse.html b/doc/html/namespaceexcuse.html index 39377f2..ce22fda 100644 --- a/doc/html/namespaceexcuse.html +++ b/doc/html/namespaceexcuse.html @@ -4,7 +4,7 @@ - +
      • Main Page
      • @@ -20,8 +20,8 @@ class  Excuse -
        Generated on Sun Jun 25 12:04:03 2006 for briteny by  +
        Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
        +doxygen 1.4.7
        diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html index 677f1a1..e188fbb 100644 --- a/doc/html/namespaces.html +++ b/doc/html/namespaces.html @@ -4,7 +4,7 @@ - +
        • Main Page
        • @@ -16,8 +16,8 @@ britney excuse -
          Generated on Sun Jun 25 12:04:03 2006 for briteny by  +
          Generated on Sat Jul 22 09:29:59 2006 for briteny by  -doxygen 1.4.6
          +doxygen 1.4.7
          diff --git a/doc/latex/FreeSans.ttf b/doc/latex/FreeSans.ttf new file mode 100644 index 0000000..b550b90 Binary files /dev/null and b/doc/latex/FreeSans.ttf differ diff --git a/doc/latex/annotated.tex b/doc/latex/annotated.tex index 200fc72..9203e2a 100644 --- a/doc/latex/annotated.tex +++ b/doc/latex/annotated.tex @@ -1,5 +1,5 @@ \section{briteny Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf britney.Britney} }{\pageref{classbritney_1_1Britney}}{} -\item\contentsline{section}{{\bf excuse.Excuse} }{\pageref{classexcuse_1_1Excuse}}{} +\item\contentsline{section}{\bf{britney.Britney} }{\pageref{classbritney_1_1Britney}}{} +\item\contentsline{section}{\bf{excuse.Excuse} }{\pageref{classexcuse_1_1Excuse}}{} \end{CompactList} diff --git a/doc/latex/classbritney_1_1Britney.tex b/doc/latex/classbritney_1_1Britney.tex index 0f4a8bf..38c486d 100644 --- a/doc/latex/classbritney_1_1Britney.tex +++ b/doc/latex/classbritney_1_1Britney.tex @@ -3,57 +3,80 @@ \subsection*{Public Member Functions} \begin{CompactItemize} \item -def {\bf \_\-\_\-init\_\-\_\-} +def \bf{\_\-\_\-init\_\-\_\-} \item -def {\bf \_\-\_\-parse\_\-arguments} +def \bf{read\_\-sources} \item -def {\bf \_\-\_\-log} +def \bf{read\_\-binaries} \item -def {\bf read\_\-sources} +def \bf{read\_\-bugs} \item -def {\bf read\_\-binaries} +def \bf{normalize\_\-bugs} \item -def {\bf read\_\-bugs} +def \bf{read\_\-dates} \item -def {\bf \_\-\_\-maxver} +def \bf{read\_\-urgencies} \item -def {\bf normalize\_\-bugs} +def \bf{read\_\-approvals} \item -def {\bf read\_\-dates} +def \bf{read\_\-hints} \item -def {\bf read\_\-urgencies} +def \bf{same\_\-source} \item -def {\bf read\_\-approvals} +def \bf{get\_\-dependency\_\-solvers} \item -def {\bf read\_\-hints} +def \bf{excuse\_\-unsat\_\-deps} \item -def {\bf same\_\-source} +def \bf{should\_\-remove\_\-source} \item -def {\bf get\_\-dependency\_\-solvers} +def \bf{should\_\-upgrade\_\-srcarch} \item -def {\bf excuse\_\-unsat\_\-deps} +def \bf{should\_\-upgrade\_\-src} \item -def {\bf should\_\-remove\_\-source} +def \bf{reversed\_\-exc\_\-deps} \item -def {\bf should\_\-upgrade\_\-srcarch} +def \bf{invalidate\_\-excuses} \item -def {\bf should\_\-upgrade\_\-src} +def \bf{write\_\-excuses} \item -def {\bf reversed\_\-exc\_\-deps} +def \bf{get\_\-nuninst}\label{classbritney_1_1Britney_41c5ee0b9d64b2e76a0c1a1c2b28c73e} + +\item +def \bf{eval\_\-nuninst}\label{classbritney_1_1Britney_e5c18b706e6598474435b1996313cf27} + +\item +def \bf{eval\_\-uninst}\label{classbritney_1_1Britney_b8dd18ead23b6e1126bb4c2a5c3cd8ba} + +\item +def \bf{doop\_\-source}\label{classbritney_1_1Britney_22af61b8a7f6fe71a79d28b5016cae1d} + \item -def {\bf invalidate\_\-excuses} +def \bf{iter\_\-packages}\label{classbritney_1_1Britney_d453398832baaa7f477f720cfb643029} + +\item +def \bf{do\_\-all}\label{classbritney_1_1Britney_3ef9b6f600eac492fc5aa4b31638198f} + +\item +def \bf{upgrade\_\-testing} +\item +def \bf{main} +\end{CompactItemize} +\subsection*{Public Attributes} +\begin{CompactItemize} \item -def {\bf write\_\-excuses} +\bf{selected}\label{classbritney_1_1Britney_07e771f94d4ce224d5677542db25034d} + \item -def {\bf main} +\bf{nuninst\_\-orig}\label{classbritney_1_1Britney_d6169c55786a8ec7fb9773170b652da6} + \end{CompactItemize} \subsection*{Static Public Attributes} \begin{CompactItemize} \item -tuple {\bf HINTS\_\-STANDARD} = (\char`\"{}easy\char`\"{}, \char`\"{}hint\char`\"{}, \char`\"{}remove\char`\"{}, \char`\"{}block\char`\"{}, \char`\"{}unblock\char`\"{}, \char`\"{}urgent\char`\"{}, \char`\"{}approve\char`\"{})\label{classbritney_1_1Britney_ebbe3f40cca59e2de275b0558556ee63} +tuple \bf{HINTS\_\-STANDARD} = (\char`\"{}easy\char`\"{}, \char`\"{}hint\char`\"{}, \char`\"{}remove\char`\"{}, \char`\"{}block\char`\"{}, \char`\"{}unblock\char`\"{}, \char`\"{}urgent\char`\"{}, \char`\"{}approve\char`\"{})\label{classbritney_1_1Britney_ebbe3f40cca59e2de275b0558556ee63} \item -tuple {\bf HINTS\_\-ALL} = (\char`\"{}force\char`\"{}, \char`\"{}force-hint\char`\"{}, \char`\"{}block-all\char`\"{})\label{classbritney_1_1Britney_a088d6fd96963f87f88c9c40cda10bfa} +tuple \bf{HINTS\_\-ALL} = (\char`\"{}force\char`\"{}, \char`\"{}force-hint\char`\"{}, \char`\"{}block-all\char`\"{})\label{classbritney_1_1Britney_a088d6fd96963f87f88c9c40cda10bfa} \end{CompactItemize} @@ -76,7 +99,7 @@ For more documentation on this script, please read the Developers Reference. -Definition at line 193 of file britney.py. +Definition at line 195 of file britney.py. \subsection{Member Function Documentation} \index{britney::Britney@{britney::Britney}!__init__@{\_\-\_\-init\_\-\_\-}} @@ -94,60 +117,9 @@ the information needed by the other methods of the class. \normalsize -Definition at line 199 of file britney.py.\index{britney::Britney@{britney::Britney}!__log@{\_\-\_\-log}} -\index{__log@{\_\-\_\-log}!britney::Britney@{britney::Britney}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.\_\-\_\-log ( {\em self}, {\em msg}, {\em type} = {\tt \char`\"{}I\char`\"{}})}\label{classbritney_1_1Britney_678036a5200302d77249f5e702532681} - - - - -\footnotesize\begin{verbatim}Print info messages according to verbosity level - -An easy-and-simple log method which prints messages to the standard -output. The type parameter controls the urgency of the message, and -can be equal to `I' for `Information', `W' for `Warning' and `E' for -`Error'. Warnings and errors are always printed, and information are -printed only if the verbose logging is enabled. -\end{verbatim} -\normalsize - - -Definition at line 275 of file britney.py.\index{britney::Britney@{britney::Britney}!__maxver@{\_\-\_\-maxver}} -\index{__maxver@{\_\-\_\-maxver}!britney::Britney@{britney::Britney}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.\_\-\_\-maxver ( {\em self}, {\em pkg}, {\em dist})}\label{classbritney_1_1Britney_0affb1945986a52c61a4492c9732968e} - - - - -\footnotesize\begin{verbatim}Return the maximum version for a given package name - -This method returns None if the specified source package -is not available in the `dist' distribution. If the package -exists, then it returns the maximum version between the -source package and its binary packages. -\end{verbatim} -\normalsize - - -Definition at line 436 of file britney.py.\index{britney::Britney@{britney::Britney}!__parse_arguments@{\_\-\_\-parse\_\-arguments}} -\index{__parse_arguments@{\_\-\_\-parse\_\-arguments}!britney::Britney@{britney::Britney}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.\_\-\_\-parse\_\-arguments ( {\em self})}\label{classbritney_1_1Britney_506f9800068902cf7cac6236b78d1dc4} - - - - -\footnotesize\begin{verbatim}Parse the command line arguments - -This method parses and initializes the command line arguments. -While doing so, it preprocesses some of the options to be converted -in a suitable form for the other methods of the class. -\end{verbatim} -\normalsize - - -Definition at line 235 of file britney.py.\index{britney::Britney@{britney::Britney}!excuse_unsat_deps@{excuse\_\-unsat\_\-deps}} +Definition at line 201 of file britney.py.\index{britney::Britney@{britney::Britney}!excuse_unsat_deps@{excuse\_\-unsat\_\-deps}} \index{excuse_unsat_deps@{excuse\_\-unsat\_\-deps}!britney::Britney@{britney::Britney}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.excuse\_\-unsat\_\-deps ( {\em self}, {\em pkg}, {\em src}, {\em arch}, {\em suite}, {\em excuse})}\label{classbritney_1_1Britney_f51c60a69f3a9dc2bc5afdb2ffaf3990} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.excuse\_\-unsat\_\-deps ( {\em self}, {\em pkg}, {\em src}, {\em arch}, {\em suite}, {\em excuse} = {\tt None}, {\em excluded} = {\tt []})}\label{classbritney_1_1Britney_f51c60a69f3a9dc2bc5afdb2ffaf3990} @@ -165,9 +137,9 @@ The dependency fields checked are Pre-Depends and Depends. \normalsize -Definition at line 713 of file britney.py.\index{britney::Britney@{britney::Britney}!get_dependency_solvers@{get\_\-dependency\_\-solvers}} +Definition at line 709 of file britney.py.\index{britney::Britney@{britney::Britney}!get_dependency_solvers@{get\_\-dependency\_\-solvers}} \index{get_dependency_solvers@{get\_\-dependency\_\-solvers}!britney::Britney@{britney::Britney}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.get\_\-dependency\_\-solvers ( {\em self}, {\em block}, {\em arch}, {\em distribution})}\label{classbritney_1_1Britney_5461f49e3e75a251ebedfd37d2a5ff0c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.get\_\-dependency\_\-solvers ( {\em self}, {\em block}, {\em arch}, {\em distribution}, {\em excluded} = {\tt []})}\label{classbritney_1_1Britney_5461f49e3e75a251ebedfd37d2a5ff0c} @@ -185,7 +157,7 @@ solving packages. \normalsize -Definition at line 675 of file britney.py.\index{britney::Britney@{britney::Britney}!invalidate_excuses@{invalidate\_\-excuses}} +Definition at line 669 of file britney.py.\index{britney::Britney@{britney::Britney}!invalidate_excuses@{invalidate\_\-excuses}} \index{invalidate_excuses@{invalidate\_\-excuses}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.invalidate\_\-excuses ( {\em self}, {\em valid}, {\em invalid})}\label{classbritney_1_1Britney_171969785db449d7a06c3f762774e0cd} @@ -201,7 +173,7 @@ on invalid excuses. The two parameters contains the list of \normalsize -Definition at line 1111 of file britney.py.\index{britney::Britney@{britney::Britney}!main@{main}} +Definition at line 1112 of file britney.py.\index{britney::Britney@{britney::Britney}!main@{main}} \index{main@{main}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.main ( {\em self})}\label{classbritney_1_1Britney_0e9551bdf927388f55be5ce15a48c94f} @@ -216,7 +188,7 @@ for the member methods which will produce the output files. \normalsize -Definition at line 1239 of file britney.py.\index{britney::Britney@{britney::Britney}!normalize_bugs@{normalize\_\-bugs}} +Definition at line 1455 of file britney.py.\index{britney::Britney@{britney::Britney}!normalize_bugs@{normalize\_\-bugs}} \index{normalize_bugs@{normalize\_\-bugs}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.normalize\_\-bugs ( {\em self})}\label{classbritney_1_1Britney_5a6af4a100cfd54e872a27fa7f48ac3c} @@ -231,7 +203,7 @@ object attribute `bugs'. \normalsize -Definition at line 454 of file britney.py.\index{britney::Britney@{britney::Britney}!read_approvals@{read\_\-approvals}} +Definition at line 448 of file britney.py.\index{britney::Britney@{britney::Britney}!read_approvals@{read\_\-approvals}} \index{read_approvals@{read\_\-approvals}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-approvals ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_39248f0cfea1c8798b2ca5a97d37eaf8} @@ -256,7 +228,7 @@ is the user who submitted the command. \normalsize -Definition at line 560 of file britney.py.\index{britney::Britney@{britney::Britney}!read_binaries@{read\_\-binaries}} +Definition at line 554 of file britney.py.\index{britney::Britney@{britney::Britney}!read_binaries@{read\_\-binaries}} \index{read_binaries@{read\_\-binaries}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-binaries ( {\em self}, {\em basedir}, {\em distribution}, {\em arch})}\label{classbritney_1_1Britney_1b2b0f42e4af1cee472f93e955b30421} @@ -288,7 +260,7 @@ packages that provide it. \normalsize -Definition at line 315 of file britney.py.\index{britney::Britney@{britney::Britney}!read_bugs@{read\_\-bugs}} +Definition at line 317 of file britney.py.\index{britney::Britney@{britney::Britney}!read_bugs@{read\_\-bugs}} \index{read_bugs@{read\_\-bugs}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-bugs ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_6c777aae69e7bec2efebaf23ddd4a86c} @@ -309,7 +281,7 @@ name and the value is the number of open RC bugs for it. \normalsize -Definition at line 412 of file britney.py.\index{britney::Britney@{britney::Britney}!read_dates@{read\_\-dates}} +Definition at line 406 of file britney.py.\index{britney::Britney@{britney::Britney}!read_dates@{read\_\-dates}} \index{read_dates@{read\_\-dates}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-dates ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_085af5ac906813ea40fc2e623748f517} @@ -332,7 +304,7 @@ name and the value is tuple with two items, the version and the date. \normalsize -Definition at line 489 of file britney.py.\index{britney::Britney@{britney::Britney}!read_hints@{read\_\-hints}} +Definition at line 483 of file britney.py.\index{britney::Britney@{britney::Britney}!read_hints@{read\_\-hints}} \index{read_hints@{read\_\-hints}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-hints ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_46d535f617fcf1faaaf5d841ea23c184} @@ -356,7 +328,7 @@ the value is the list of affected packages. \normalsize -Definition at line 586 of file britney.py.\index{britney::Britney@{britney::Britney}!read_sources@{read\_\-sources}} +Definition at line 580 of file britney.py.\index{britney::Britney@{britney::Britney}!read_sources@{read\_\-sources}} \index{read_sources@{read\_\-sources}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-sources ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_054f44c47f17c0c4f5a069e821b7f868} @@ -376,7 +348,7 @@ package as a dictionary. \normalsize -Definition at line 290 of file britney.py.\index{britney::Britney@{britney::Britney}!read_urgencies@{read\_\-urgencies}} +Definition at line 292 of file britney.py.\index{britney::Britney@{britney::Britney}!read_urgencies@{read\_\-urgencies}} \index{read_urgencies@{read\_\-urgencies}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.read\_\-urgencies ( {\em self}, {\em basedir})}\label{classbritney_1_1Britney_09fc27899506b4830b1961f125a7b6a4} @@ -398,7 +370,7 @@ package that are higher then the testing one. \normalsize -Definition at line 515 of file britney.py.\index{britney::Britney@{britney::Britney}!reversed_exc_deps@{reversed\_\-exc\_\-deps}} +Definition at line 509 of file britney.py.\index{britney::Britney@{britney::Britney}!reversed_exc_deps@{reversed\_\-exc\_\-deps}} \index{reversed_exc_deps@{reversed\_\-exc\_\-deps}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.reversed\_\-exc\_\-deps ( {\em self})}\label{classbritney_1_1Britney_be1b4af9d6c6650c70b24267412bc1a8} @@ -413,7 +385,7 @@ and the values are the excuse names which depend on it. \normalsize -Definition at line 1098 of file britney.py.\index{britney::Britney@{britney::Britney}!same_source@{same\_\-source}} +Definition at line 1099 of file britney.py.\index{britney::Britney@{britney::Britney}!same_source@{same\_\-source}} \index{same_source@{same\_\-source}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.same\_\-source ( {\em self}, {\em sv1}, {\em sv2})}\label{classbritney_1_1Britney_85d2e45e8431779b62f398c34972ddf1} @@ -429,7 +401,7 @@ source. The main use of this code is to detect binary-NMU. \normalsize -Definition at line 636 of file britney.py.\index{britney::Britney@{britney::Britney}!should_remove_source@{should\_\-remove\_\-source}} +Definition at line 630 of file britney.py.\index{britney::Britney@{britney::Britney}!should_remove_source@{should\_\-remove\_\-source}} \index{should_remove_source@{should\_\-remove\_\-source}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.should\_\-remove\_\-source ( {\em self}, {\em pkg})}\label{classbritney_1_1Britney_f8a6c9adbdec7a5a982dd2b74febcc08} @@ -449,7 +421,7 @@ attribute excuses. \normalsize -Definition at line 764 of file britney.py.\index{britney::Britney@{britney::Britney}!should_upgrade_src@{should\_\-upgrade\_\-src}} +Definition at line 765 of file britney.py.\index{britney::Britney@{britney::Britney}!should_upgrade_src@{should\_\-upgrade\_\-src}} \index{should_upgrade_src@{should\_\-upgrade\_\-src}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.should\_\-upgrade\_\-src ( {\em self}, {\em src}, {\em suite})}\label{classbritney_1_1Britney_94785175a85f44b1afaf3add167a211f} @@ -469,7 +441,7 @@ the the object attribute excuses. \normalsize -Definition at line 902 of file britney.py.\index{britney::Britney@{britney::Britney}!should_upgrade_srcarch@{should\_\-upgrade\_\-srcarch}} +Definition at line 903 of file britney.py.\index{britney::Britney@{britney::Britney}!should_upgrade_srcarch@{should\_\-upgrade\_\-srcarch}} \index{should_upgrade_srcarch@{should\_\-upgrade\_\-srcarch}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.should\_\-upgrade\_\-srcarch ( {\em self}, {\em src}, {\em arch}, {\em suite})}\label{classbritney_1_1Britney_bd18d7acde434387e94344a39db5b0e5} @@ -491,7 +463,21 @@ the the object attribute excuses. \normalsize -Definition at line 788 of file britney.py.\index{britney::Britney@{britney::Britney}!write_excuses@{write\_\-excuses}} +Definition at line 789 of file britney.py.\index{britney::Britney@{britney::Britney}!upgrade_testing@{upgrade\_\-testing}} +\index{upgrade_testing@{upgrade\_\-testing}!britney::Britney@{britney::Britney}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.upgrade\_\-testing ( {\em self})}\label{classbritney_1_1Britney_921effe0d64ed713c38888684a0a26d4} + + + + +\footnotesize\begin{verbatim}Upgrade testing using the unstable packages + +This method tries to upgrade testing using the packages from unstable. +\end{verbatim} +\normalsize + + +Definition at line 1438 of file britney.py.\index{britney::Britney@{britney::Britney}!write_excuses@{write\_\-excuses}} \index{write_excuses@{write\_\-excuses}!britney::Britney@{britney::Britney}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}def britney.Britney.write\_\-excuses ( {\em self})}\label{classbritney_1_1Britney_010f6deffca32f7f71ecf1f5c1bb4985} @@ -507,7 +493,7 @@ of this procedure, please refer to the module docstring. \normalsize -Definition at line 1153 of file britney.py. +Definition at line 1154 of file britney.py. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/doc/latex/classexcuse_1_1Excuse.tex b/doc/latex/classexcuse_1_1Excuse.tex index c24de7f..5fd2977 100644 --- a/doc/latex/classexcuse_1_1Excuse.tex +++ b/doc/latex/classexcuse_1_1Excuse.tex @@ -3,36 +3,36 @@ \subsection*{Public Member Functions} \begin{CompactItemize} \item -def {\bf \_\-\_\-init\_\-\_\-} +def \bf{\_\-\_\-init\_\-\_\-} \item -def {\bf set\_\-vers} +def \bf{set\_\-vers} \item -def {\bf set\_\-maint} +def \bf{set\_\-maint} \item -def {\bf set\_\-section} +def \bf{set\_\-section} \item -def {\bf set\_\-priority} +def \bf{set\_\-priority} \item -def {\bf set\_\-date} +def \bf{set\_\-date} \item -def {\bf set\_\-urgency} +def \bf{set\_\-urgency} \item -def {\bf add\_\-dep} +def \bf{add\_\-dep} \item -def {\bf add\_\-break\_\-dep} +def \bf{add\_\-break\_\-dep} \item -def {\bf invalidate\_\-dep} +def \bf{invalidate\_\-dep} \item -def {\bf setdaysold} +def \bf{setdaysold} \item -def {\bf addhtml} +def \bf{addhtml} \item -def {\bf html} +def \bf{html} \end{CompactItemize} \subsection*{Static Public Attributes} \begin{CompactItemize} \item -tuple {\bf reemail} = re.compile(r\char`\"{}$<$.$\ast$?$>$\char`\"{})\label{classexcuse_1_1Excuse_bb15f55eed8f034db8a64b4ddc46460d} +tuple \bf{reemail} = re.compile(r\char`\"{}$<$.$\ast$?$>$\char`\"{})\label{classexcuse_1_1Excuse_bb15f55eed8f034db8a64b4ddc46460d} \begin{CompactList}\small\item\em Regular expression for removing the email address. \item\end{CompactList}\end{CompactItemize} diff --git a/doc/latex/doxygen.sty b/doc/latex/doxygen.sty index a40855d..a9aed06 100644 --- a/doc/latex/doxygen.sty +++ b/doc/latex/doxygen.sty @@ -10,16 +10,30 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Sun Jun 25 12:04:02 2006 for briteny by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Sun Jun 25 12:04:02 2006 for briteny by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Sat Jul 22 09:29:59 2006 for briteny by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Sat Jul 22 09:29:59 2006 for briteny by Doxygen }} \cfoot{} +\newenvironment{Code} +{\footnotesize} +{\normalsize} +\newcommand{\doxyref}[3]{\textbf{#1} (\textnormal{#2}\,\pageref{#3})} +\newenvironment{DocInclude} +{\footnotesize} +{\normalsize} +\newenvironment{VerbInclude} +{\footnotesize} +{\normalsize} +\newenvironment{Image} +{\begin{figure}[H]} +{\end{figure}} +\newenvironment{ImageNoCaption}{}{} \newenvironment{CompactList} {\begin{list}{}{ \setlength{\leftmargin}{0.5cm} \setlength{\itemsep}{0pt} \setlength{\parsep}{0pt} \setlength{\topsep}{0pt} - \renewcommand{\makelabel}{}}} + \renewcommand{\makelabel}{\hfill}}} {\end{list}} \newenvironment{CompactItemize} { @@ -41,7 +55,7 @@ } {\end{tabular*}\par} \newcommand{\entrylabel}[1]{ - {\parbox[b]{\labelwidth-4pt}{\makebox[0pt][l]{\textbf{#1}}\\}}} + {\parbox[b]{\labelwidth-4pt}{\makebox[0pt][l]{\textbf{#1}}\vspace{1.5\baselineskip}}}} \newenvironment{Desc} {\begin{list}{} { diff --git a/doc/latex/namespacebritney.tex b/doc/latex/namespacebritney.tex index f75051a..1af6167 100644 --- a/doc/latex/namespacebritney.tex +++ b/doc/latex/namespacebritney.tex @@ -5,5 +5,5 @@ \subsection*{Classes} \begin{CompactItemize} \item -class {\bf Britney} +class \bf{Britney} \end{CompactItemize} diff --git a/doc/latex/namespaceexcuse.tex b/doc/latex/namespaceexcuse.tex index ef344c5..4d878c0 100644 --- a/doc/latex/namespaceexcuse.tex +++ b/doc/latex/namespaceexcuse.tex @@ -5,5 +5,5 @@ \subsection*{Classes} \begin{CompactItemize} \item -class {\bf Excuse} +class \bf{Excuse} \end{CompactItemize} diff --git a/doc/latex/namespaces.tex b/doc/latex/namespaces.tex index 40edb65..1bf85c5 100644 --- a/doc/latex/namespaces.tex +++ b/doc/latex/namespaces.tex @@ -1,5 +1,5 @@ \section{briteny Package List} Here are the packages with brief descriptions (if available):\begin{CompactList} -\item\contentsline{section}{{\bf britney} }{\pageref{namespacebritney}}{} -\item\contentsline{section}{{\bf excuse} }{\pageref{namespaceexcuse}}{} +\item\contentsline{section}{\bf{britney} }{\pageref{namespacebritney}}{} +\item\contentsline{section}{\bf{excuse} }{\pageref{namespaceexcuse}}{} \end{CompactList} diff --git a/doc/latex/refman.tex b/doc/latex/refman.tex index 56588e6..e876595 100644 --- a/doc/latex/refman.tex +++ b/doc/latex/refman.tex @@ -17,9 +17,9 @@ \begin{center} {\Large briteny Reference Manual\\[1ex]\large 2.0.alpha1 }\\ \vspace*{1cm} -{\large Generated by Doxygen 1.4.6}\\ +{\large Generated by Doxygen 1.4.7}\\ \vspace*{0.5cm} -{\small Sun Jun 25 12:04:03 2006}\\ +{\small Sat Jul 22 09:29:59 2006}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -29,8 +29,6 @@ \pagenumbering{arabic} \chapter{briteny Namespace Index} \input{namespaces} -\chapter{briteny Hierarchical Index} -\input{hierarchy} \chapter{briteny Class Index} \input{annotated} \chapter{briteny Namespace Documentation}