abtlinux-svn Mailing List for ABout Time Linux (AbTLinux) (Page 5)
Status: Alpha
Brought to you by:
eschabell
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(12) |
Apr
(4) |
May
(61) |
Jun
(5) |
Jul
(12) |
Aug
(1) |
Sep
|
Oct
(29) |
Nov
(89) |
Dec
(37) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(4) |
Feb
(33) |
Mar
(12) |
Apr
|
May
(2) |
Jun
(13) |
Jul
(76) |
Aug
(7) |
Sep
(21) |
Oct
|
Nov
|
Dec
(33) |
2008 |
Jan
(32) |
Feb
(24) |
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
From: <esc...@us...> - 2007-12-31 11:27:59
|
Revision: 452 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=452&view=rev Author: eschabell Date: 2007-12-31 03:27:36 -0800 (Mon, 31 Dec 2007) Log Message: ----------- Refactored some user paths when non-root users try to start abt. Modified Paths: -------------- src/trunk/abt.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-12-31 11:24:54 UTC (rev 451) +++ src/trunk/abt.rb 2007-12-31 11:27:36 UTC (rev 452) @@ -32,30 +32,45 @@ load '/etc/abt/abtconfig.rb' else # missing configuration file, do some abt update? - puts "\n[abt.rb] Missing our main configuration file at /etc/abt/abtconfig.rb" - puts "\n Maybe time for an abt update? Let us try to fix it for you!\n" - ["/etc/abt", "/etc/abt/local"].each { |dir| - if ( ! File.directory?( dir ) ) - FileUtils.mkdir_p( dir ) - puts "Created directory: #{dir}." - end - } - system( "svn export #{$ABTLINUX_MAIN_CONFIG} /etc/abt/abtconfig.rb" ) - exit + puts "\nMissing our main configuration file at /etc/abt/abtconfig.rb" + puts "\nMaybe time for an abt update? Let us try to fix it for you!\n" + # TODO: check for root login. + if ( Process.uid != 0 ) + puts "\nMust be root to fix configuration files." + exit + else + ["/etc/abt", "/etc/abt/local"].each { |dir| + if ( ! File.directory?( dir ) ) + FileUtils.mkdir_p( dir ) + puts "Created directory: #{dir}." + end + } + system( "svn export #{$ABTLINUX_MAIN_CONFIG} /etc/abt/abtconfig.rb" ) + exit + end end ## # Setup needed classes and get ready to parse arguments. ## manager = AbtPackageManager.new -logger = Logger.new($JOURNAL) # initializes all needed paths. reporter = AbtReportManager.new downloader = AbtDownloadManager.new system = AbtSystemManager.new options = Hash.new show = AbtUsage.new +# deal with usage request. +if ( ARGV.length == 0 || ( ARGV.length == 1 && ( ARGV[0] == '--help' || ARGV[0] == '-h' || ARGV[0].downcase == 'help' ) ) ) + show.usage( "all" ) + exit +end + +# login as root for the rest. +manager.root_login( ARGV ) + # setup timestamp. +logger = Logger.new($JOURNAL) # initializes all needed paths. logger.datetime_format = "%Y-%m-%d %H:%M:%S " # TODO: used only until refactoring done. @@ -68,15 +83,7 @@ logger.info( "[abt.rb] No local configuration file found, not a problem, just informing." ) end -# deal with usage request. -if ( ARGV.length == 0 || ( ARGV.length == 1 && ( ARGV[0] == '--help' || ARGV[0] == '-h' || ARGV[0].downcase == 'help' ) ) ) - show.usage( "all" ) - exit -end -# login as root for the rest. -manager.root_login( ARGV ) - # parse arguments. case ARGV[0] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-31 11:25:34
|
Revision: 451 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=451&view=rev Author: eschabell Date: 2007-12-31 03:24:54 -0800 (Mon, 31 Dec 2007) Log Message: ----------- Added output text to root login to clarify usage for user. Modified Paths: -------------- src/trunk/abtpackagemanager.rb Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-30 21:04:18 UTC (rev 450) +++ src/trunk/abtpackagemanager.rb 2007-12-31 11:24:54 UTC (rev 451) @@ -411,6 +411,7 @@ def root_login( arguments ) if ( Process.uid != 0 ) args = "" + puts "\nYou need to be root for accessing the requested functionality.\n" puts "\nEnter root password:" for i in 0...ARGV.length This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-30 21:04:45
|
Revision: 450 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=450&view=rev Author: eschabell Date: 2007-12-30 13:04:18 -0800 (Sun, 30 Dec 2007) Log Message: ----------- Implemented checks for main config file and for possible local config file to override settings. Refactored this to use load instead of require which ensures each run will load these files (require does it just once), thereby picking up any changes on next pass. If the main config file is missing, it will attempt to svn a copy from the central repo to fix itself. Modified Paths: -------------- src/trunk/abt.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-12-29 18:25:47 UTC (rev 449) +++ src/trunk/abt.rb 2007-12-30 21:04:18 UTC (rev 450) @@ -24,8 +24,26 @@ # AbTLinux; if not, write to the Free Software Foundation, Inc., 51 Franklin # St, Fifth Floor, Boston, MA 02110-1301 USA ## -require 'abtconfig' +# Load our central configuration file. +$ABTLINUX_MAIN_CONFIG = "https://abtlinux.svn.sourceforge.net/svnroot/abtlinux/src/trunk/abtconfig.rb" + +if File.exist?( "/etc/abt/abtconfig.rb" ) + load '/etc/abt/abtconfig.rb' +else + # missing configuration file, do some abt update? + puts "\n[abt.rb] Missing our main configuration file at /etc/abt/abtconfig.rb" + puts "\n Maybe time for an abt update? Let us try to fix it for you!\n" + ["/etc/abt", "/etc/abt/local"].each { |dir| + if ( ! File.directory?( dir ) ) + FileUtils.mkdir_p( dir ) + puts "Created directory: #{dir}." + end + } + system( "svn export #{$ABTLINUX_MAIN_CONFIG} /etc/abt/abtconfig.rb" ) + exit +end + ## # Setup needed classes and get ready to parse arguments. ## @@ -40,10 +58,16 @@ # setup timestamp. logger.datetime_format = "%Y-%m-%d %H:%M:%S " - # TODO: used only until refactoring done. myLogger = AbtLogManager.new +# And loading local file if found. +if File.exist?( "/etc/abt/local/localconfig.rb" ) + load '/etc/abt/local/localconfig.rb' +else + logger.info( "[abt.rb] No local configuration file found, not a problem, just informing." ) +end + # deal with usage request. if ( ARGV.length == 0 || ( ARGV.length == 1 && ( ARGV[0] == '--help' || ARGV[0] == '-h' || ARGV[0].downcase == 'help' ) ) ) show.usage( "all" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-29 18:25:42
|
Revision: 449 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=449&view=rev Author: eschabell Date: 2007-12-29 10:25:47 -0800 (Sat, 29 Dec 2007) Log Message: ----------- TODO markers added for methods yet to be implemented. This adds them to the Task list in eclipse, handy for finishing up the work planned. Modified Paths: -------------- src/trunk/abtdepengine.rb src/trunk/abtreportmanager.rb src/trunk/abtsystemmanager.rb Property Changed: ---------------- src/trunk/ Property changes on: src/trunk ___________________________________________________________________ Name: svn:ignore + .settings .project .loadpath Modified: src/trunk/abtdepengine.rb =================================================================== --- src/trunk/abtdepengine.rb 2007-12-27 19:26:34 UTC (rev 448) +++ src/trunk/abtdepengine.rb 2007-12-29 18:25:47 UTC (rev 449) @@ -39,6 +39,7 @@ # <b>RETURN</b> <i>AbtDepEngine</i> - an initialized AbtDepEngine object. ## def initialize + # TODO: implement this. end end Modified: src/trunk/abtreportmanager.rb =================================================================== --- src/trunk/abtreportmanager.rb 2007-12-27 19:26:34 UTC (rev 448) +++ src/trunk/abtreportmanager.rb 2007-12-29 18:25:47 UTC (rev 449) @@ -184,6 +184,7 @@ # hash of problem files and their encountered errors. ## def show_package_dependencies( package ) + # TODO: implement this. return false end @@ -195,6 +196,7 @@ # <b>RETURN</b> <i>void.</i> ## def show_untracked_files + # TODO: implement this. return false end @@ -231,6 +233,7 @@ # <b>RETURN</b> <i>void.</i> ## def show_file_owner( file ) + # TODO: implement this. return false end @@ -319,6 +322,7 @@ # false. ## def show_updates( target ) + # TODO: implement this. return false end @@ -328,6 +332,7 @@ # <b>RETURN</b> <i>void.</i> ## def generate_HTML_package_listing + # TODO: implement this. return false end end Modified: src/trunk/abtsystemmanager.rb =================================================================== --- src/trunk/abtsystemmanager.rb 2007-12-27 19:26:34 UTC (rev 448) +++ src/trunk/abtsystemmanager.rb 2007-12-29 18:25:47 UTC (rev 449) @@ -168,6 +168,7 @@ # or broken, otherwise false. ## def verify_symlinks( package ) + # TODO: implement this. return false end @@ -180,6 +181,7 @@ # false. ## def verify_package_depends( package ) + # TODO: implement this. return false end @@ -247,6 +249,7 @@ # false. ## def fix_package( package ) + # TODO: implement this. return false end @@ -259,6 +262,7 @@ # <b>RETURN</b> <i>boolean</i> - True if the URI is set, otherwise false. ## def set_central_repo( uri ) + # TODO: implement this. return false end @@ -272,6 +276,7 @@ # otherwise false. ## def set_package_tree_location( location ) + # TODO: implement this. return false end @@ -316,5 +321,4 @@ return false end - end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-27 19:26:32
|
Revision: 448 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=448&view=rev Author: eschabell Date: 2007-12-27 11:26:34 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/classes/AbtReportManager.html src/trunk/doc/classes/TestAbtPackageManager.html src/trunk/doc/classes/TestAbtReportManager.html src/trunk/doc/created.rid src/trunk/doc/files/abtpackagemanager_rb.html src/trunk/doc/files/abtreportmanager_rb.html src/trunk/doc/files/testabtpackagemanager_rb.html src/trunk/doc/files/testabtreportmanager_rb.html Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2007-12-27 19:11:11 UTC (rev 447) +++ src/trunk/doc/classes/AbtPackageManager.html 2007-12-27 19:26:34 UTC (rev 448) @@ -182,19 +182,20 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p> <div id="M000047_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 322</span> -322: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgrade_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) -323: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -324: -325: <span class="ruby-comment cmt"># check for frozen.</span> -326: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) -327: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with downgrade package call."</span> -328: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with downgrade package call."</span> -329: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -330: <span class="ruby-keyword kw">end</span> -331: -332: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -333: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 350</span> +350: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgrade_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) +351: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +352: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +353: +354: <span class="ruby-comment cmt"># check for frozen.</span> +355: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +356: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with downgrade package call."</span> +357: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with downgrade package call."</span> +358: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +359: <span class="ruby-keyword kw">end</span> +360: +361: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +362: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -220,37 +221,37 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000048_source')" id="l_M000048_source">show source</a> ]</p> <div id="M000048_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 344</span> -344: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freeze_package</span>( <span class="ruby-identifier">package</span> ) -345: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> -346: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) -347: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> -348: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -349: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -350: -351: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) -352: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) -353: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is already frozen!"</span> ) -354: -355: <span class="ruby-comment cmt"># package already frozen, need to un-freeze by removing frozen.log</span> -356: <span class="ruby-comment cmt"># file.</span> -357: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span> <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> -358: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} was frozen, it has now been relased for use."</span> -359: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} released : removed file #{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> -360: <span class="ruby-keyword kw">else</span> -361: <span class="ruby-comment cmt"># place file in $PACKAGE_INSTALLED frozen.log with date.</span> -362: <span class="ruby-identifier">frozen</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span>, <span class="ruby-value str">"w"</span> ) -363: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP}"</span> -364: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">close</span> -365: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is now frozen."</span> ) -366: <span class="ruby-keyword kw">end</span> -367: -368: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -369: <span class="ruby-keyword kw">end</span> -370: -371: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is not installed, unable to freeze it."</span> ) -372: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -373: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 373</span> +373: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freeze_package</span>( <span class="ruby-identifier">package</span> ) +374: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> +375: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +376: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> +377: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +378: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +379: +380: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) +381: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +382: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is already frozen!"</span> ) +383: +384: <span class="ruby-comment cmt"># package already frozen, need to un-freeze by removing frozen.log</span> +385: <span class="ruby-comment cmt"># file.</span> +386: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span> <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> +387: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} was frozen, it has now been relased for use."</span> +388: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} released : removed file #{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> +389: <span class="ruby-keyword kw">else</span> +390: <span class="ruby-comment cmt"># place file in $PACKAGE_INSTALLED frozen.log with date.</span> +391: <span class="ruby-identifier">frozen</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span>, <span class="ruby-value str">"w"</span> ) +392: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP}"</span> +393: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">close</span> +394: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is now frozen."</span> ) +395: <span class="ruby-keyword kw">end</span> +396: +397: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +398: <span class="ruby-keyword kw">end</span> +399: +400: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is not installed, unable to freeze it."</span> ) +401: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +402: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -403,7 +404,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000045"></a><b>reinstall_package</b>( package ) + <a name="M000045"></a><b>reinstall_package</b>( package, automated_build=false ) </div> <div class="description"> <p> @@ -411,6 +412,8 @@ </p> <p> <b>PARAM</b> <em>String</em> - the name of the package to be reinstalled. +<b>PARAM</b> <em>Boolean</em> - query the user if false (default), +otherwise true and skip query. </p> <p> <b>RETURN</b> <em>boolean</em> - True if the package is reinstalled, @@ -421,39 +424,66 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p> <div id="M000045_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 221</span> -221: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstall_package</span>( <span class="ruby-identifier">package</span> ) -222: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -223: <span class="ruby-comment cmt"># TODO: look into refactoring myLogger:</span> -224: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -225: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -226: -227: <span class="ruby-comment cmt"># check for frozen.</span> -228: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) -229: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with reinstall package call."</span> -230: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with reinstall package call."</span> -231: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -232: <span class="ruby-keyword kw">end</span> -233: -234: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">install_package</span>( <span class="ruby-identifier">package</span> ) ) -235: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -236: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed reinstall of #{package}. ***"</span> -237: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -238: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Completed reinstall of #{package}."</span> ) -239: -240: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) ) -241: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -242: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed caching of package #{package}. ***"</span> -243: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -244: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching completed for package #{package}."</span> ) -245: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -246: <span class="ruby-keyword kw">else</span> -247: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching of package #{package} failed."</span>) -248: <span class="ruby-keyword kw">end</span> -249: <span class="ruby-keyword kw">end</span> -250: -251: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -252: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 222</span> +222: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstall_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">automated_build</span>=<span class="ruby-keyword kw">false</span> ) +223: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +224: <span class="ruby-comment cmt"># TODO: look into refactoring myLogger:</span> +225: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +226: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +227: +228: <span class="ruby-comment cmt"># check for frozen.</span> +229: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +230: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with reinstall package call."</span> +231: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with reinstall package call."</span> +232: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +233: <span class="ruby-keyword kw">end</span> +234: +235: <span class="ruby-comment cmt"># check if already installed.</span> +236: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) +237: +238: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">automated_build</span> +239: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Package #{package} is already installed! ***\n"</span> +240: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Are you sure you want to proceed with a reinstall? (y/n)"</span> +241: +242: <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">answer</span> = <span class="ruby-constant">STDIN</span>.<span class="ruby-identifier">gets</span> +243: <span class="ruby-identifier">answer</span>.<span class="ruby-identifier">chomp!</span> +244: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">answer</span> <span class="ruby-operator">==</span> <span class="ruby-value str">"y"</span> +245: <span class="ruby-keyword kw">break</span> +246: <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">answer</span> <span class="ruby-operator">==</span> <span class="ruby-value str">"n"</span> +247: <span class="ruby-identifier">exit</span> +248: <span class="ruby-keyword kw">else</span> +249: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Are you sure you want to reinstall #{package}? (y/n)"</span> +250: <span class="ruby-keyword kw">end</span> +251: <span class="ruby-keyword kw">end</span> +252: <span class="ruby-keyword kw">end</span> +253: <span class="ruby-keyword kw">else</span> +254: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Package #{package} is not installed, we will install it for you now! ***\n"</span> +255: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Hit enter to continue..."</span> +256: <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">continue</span> = <span class="ruby-constant">STDIN</span>.<span class="ruby-identifier">gets</span> +257: <span class="ruby-identifier">continue</span>.<span class="ruby-identifier">chomp!</span> +258: <span class="ruby-keyword kw">break</span> +259: <span class="ruby-keyword kw">end</span> +260: <span class="ruby-keyword kw">end</span> +261: +262: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">install_package</span>( <span class="ruby-identifier">package</span> ) ) +263: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +264: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed reinstall of #{package}. ***"</span> +265: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +266: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Completed reinstall of #{package}."</span> ) +267: +268: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) ) +269: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +270: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed caching of package #{package}. ***"</span> +271: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +272: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching completed for package #{package}."</span> ) +273: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +274: <span class="ruby-keyword kw">else</span> +275: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching of package #{package} failed."</span>) +276: <span class="ruby-keyword kw">end</span> +277: <span class="ruby-keyword kw">end</span> +278: +279: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +280: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -478,56 +508,56 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p> <div id="M000046_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 262</span> -262: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_package</span>( <span class="ruby-identifier">package</span> ) -263: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> -264: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) -265: <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> -266: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -267: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -268: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -269: -270: <span class="ruby-comment cmt"># get package details.</span> -271: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> -272: -273: <span class="ruby-comment cmt"># check for frozen.</span> -274: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) -275: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with remove package call."</span> -276: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with remove package call."</span> -277: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -278: <span class="ruby-keyword kw">end</span> -279: -280: <span class="ruby-comment cmt"># TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install?</span> -281: -282: <span class="ruby-comment cmt"># remove listings in install log.</span> -283: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) -284: -285: <span class="ruby-comment cmt"># only process install log if it exists, continue on with </span> -286: <span class="ruby-comment cmt"># journal log warning.</span> -287: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) -288: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">installLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> -289: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) -290: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) -291: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed file #{line.chomp} from #{package} install log."</span>) -292: <span class="ruby-keyword kw">else</span> -293: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Unable to remove #{line.chomp} from #{package} install log, does not exist."</span>) -294: <span class="ruby-comment cmt"># do not return false, removed is ok, just put warning in journal log.</span> -295: <span class="ruby-keyword kw">end</span> -296: <span class="ruby-keyword kw">end</span> -297: -298: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed files from #{File.basename( installLog )} for #{package}."</span> ) -299: <span class="ruby-keyword kw">else</span> -300: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Install log missing for #{package}, see journal..."</span> -301: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Install log was missing for #{package}..."</span> ) -302: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"...continuing to remove package from install listing, but might have files still installed on system."</span> ) -303: <span class="ruby-keyword kw">end</span> -304: -305: -306: <span class="ruby-comment cmt"># remove entry in install listing.</span> -307: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">remove_dir</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}"</span> ) -308: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Removed entry from installed packages."</span> ) -309: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -310: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 290</span> +290: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_package</span>( <span class="ruby-identifier">package</span> ) +291: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> +292: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +293: <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> +294: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +295: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +296: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +297: +298: <span class="ruby-comment cmt"># get package details.</span> +299: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> +300: +301: <span class="ruby-comment cmt"># check for frozen.</span> +302: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +303: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with remove package call."</span> +304: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with remove package call."</span> +305: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +306: <span class="ruby-keyword kw">end</span> +307: +308: <span class="ruby-comment cmt"># TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install?</span> +309: +310: <span class="ruby-comment cmt"># remove listings in install log.</span> +311: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) +312: +313: <span class="ruby-comment cmt"># only process install log if it exists, continue on with </span> +314: <span class="ruby-comment cmt"># journal log warning.</span> +315: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) +316: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">installLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> +317: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) +318: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) +319: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed file #{line.chomp} from #{package} install log."</span>) +320: <span class="ruby-keyword kw">else</span> +321: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Unable to remove #{line.chomp} from #{package} install log, does not exist."</span>) +322: <span class="ruby-comment cmt"># do not return false, removed is ok, just put warning in journal log.</span> +323: <span class="ruby-keyword kw">end</span> +324: <span class="ruby-keyword kw">end</span> +325: +326: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed files from #{File.basename( installLog )} for #{package}."</span> ) +327: <span class="ruby-keyword kw">else</span> +328: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Install log missing for #{package}, see journal..."</span> +329: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Install log was missing for #{package}..."</span> ) +330: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"...continuing to remove package from install listing, but might have files still installed on system."</span> ) +331: <span class="ruby-keyword kw">end</span> +332: +333: +334: <span class="ruby-comment cmt"># remove entry in install listing.</span> +335: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">remove_dir</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}"</span> ) +336: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Removed entry from installed packages."</span> ) +337: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +338: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -551,20 +581,20 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000049_source')" id="l_M000049_source">show source</a> ]</p> <div id="M000049_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 382</span> -382: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) -383: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) -384: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> -385: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> -386: -387: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> -388: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] -389: <span class="ruby-keyword kw">end</span> -390: -391: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) -392: <span class="ruby-identifier">exit</span> -393: <span class="ruby-keyword kw">end</span> -394: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 411</span> +411: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) +412: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) +413: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> +414: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> +415: +416: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> +417: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] +418: <span class="ruby-keyword kw">end</span> +419: +420: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) +421: <span class="ruby-identifier">exit</span> +422: <span class="ruby-keyword kw">end</span> +423: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtReportManager.html =================================================================== --- src/trunk/doc/classes/AbtReportManager.html 2007-12-27 19:11:11 UTC (rev 447) +++ src/trunk/doc/classes/AbtReportManager.html 2007-12-27 19:26:34 UTC (rev 448) @@ -179,10 +179,10 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000125_source')" id="l_M000125_source">show source</a> ]</p> <div id="M000125_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtreportmanager.rb, line 296</span> -296: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_HTML_package_listing</span> -297: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -298: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtreportmanager.rb, line 330</span> +330: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_HTML_package_listing</span> +331: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +332: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -208,41 +208,41 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000122_source')" id="l_M000122_source">show source</a> ]</p> <div id="M000122_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtreportmanager.rb, line 212</span> -212: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">search_package_descriptions</span>( <span class="ruby-identifier">searchText</span> ) -213: <span class="ruby-identifier">packageHash</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># has for values found.</span> -214: -215: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">entries</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) <span class="ruby-operator">-</span> [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'..'</span> ] ).<span class="ruby-identifier">empty?</span> -216: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">packageHash</span> <span class="ruby-comment cmt"># empty hash, no entries.</span> -217: <span class="ruby-keyword kw">else</span> -218: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) { <span class="ruby-operator">|</span><span class="ruby-identifier">package</span><span class="ruby-operator">|</span> -219: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">"."</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">".."</span>) -220: <span class="ruby-comment cmt"># split the installed entry into two parts,</span> -221: <span class="ruby-comment cmt"># the package name and the version number.</span> -222: <span class="ruby-identifier">packageArray</span> = <span class="ruby-identifier">package</span>.<span class="ruby-identifier">split</span>( <span class="ruby-value str">"-"</span> ) -223: <span class="ruby-identifier">packageName</span> = <span class="ruby-identifier">packageArray</span>[<span class="ruby-value">0</span>] -224: -225: <span class="ruby-comment cmt"># check for match to name and description if the package file exists.</span> -226: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}#{packageName}.rb"</span> ) ) -227: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{packageName}"</span> -228: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{packageName.capitalize}.new"</span> ) -229: -230: <span class="ruby-comment cmt"># add if matches name or description entries.</span> -231: <span class="ruby-identifier">matchesArray</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">description</span>.<span class="ruby-identifier">scan</span>( <span class="ruby-identifier">searchText</span> ) -232: <span class="ruby-identifier">matchesArray</span> = <span class="ruby-identifier">matchesArray</span>.<span class="ruby-identifier">concat</span>( <span class="ruby-identifier">packageName</span>.<span class="ruby-identifier">scan</span>( <span class="ruby-identifier">searchText</span> ) ) -233: -234: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">matchesArray</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">></span> <span class="ruby-value">0</span> ) -235: <span class="ruby-comment cmt"># matches so add to hash.</span> -236: <span class="ruby-identifier">packageHash</span> = <span class="ruby-identifier">packageHash</span>.<span class="ruby-identifier">merge</span>( <span class="ruby-constant">Hash</span>[ <span class="ruby-node">"#{package}"</span> =<span class="ruby-operator">></span> <span class="ruby-node">"#{sw.description}"</span> ] ) -237: <span class="ruby-keyword kw">end</span> -238: <span class="ruby-keyword kw">end</span> -239: <span class="ruby-keyword kw">end</span> -240: } -241: <span class="ruby-keyword kw">end</span> -242: -243: <span class="ruby-comment cmt"># finished search results.</span> -244: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">packageHash</span> -245: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtreportmanager.rb, line 246</span> +246: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">search_package_descriptions</span>( <span class="ruby-identifier">searchText</span> ) +247: <span class="ruby-identifier">packageHash</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># has for values found.</span> +248: +249: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">entries</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) <span class="ruby-operator">-</span> [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'..'</span> ] ).<span class="ruby-identifier">empty?</span> +250: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">packageHash</span> <span class="ruby-comment cmt"># empty hash, no entries.</span> +251: <span class="ruby-keyword kw">else</span> +252: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) { <span class="ruby-operator">|</span><span class="ruby-identifier">package</span><span class="ruby-operator">|</span> +253: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">"."</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">".."</span>) +254: <span class="ruby-comment cmt"># split the installed entry into two parts,</span> +255: <span class="ruby-comment cmt"># the package name and the version number.</span> +256: <span class="ruby-identifier">packageArray</span> = <span class="ruby-identifier">package</span>.<span class="ruby-identifier">split</span>( <span class="ruby-value str">"-"</span> ) +257: <span class="ruby-identifier">packageName</span> = <span class="ruby-identifier">packageArray</span>[<span class="ruby-value">0</span>] +258: +259: <span class="ruby-comment cmt"># check for match to name and description if the package file exists.</span> +260: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}#{packageName}.rb"</span> ) ) +261: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{packageName}"</span> +262: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{packageName.capitalize}.new"</span> ) +263: +264: <span class="ruby-comment cmt"># add if matches name or description entries.</span> +265: <span class="ruby-identifier">matchesArray</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">description</span>.<span class="ruby-identifier">scan</span>( <span class="ruby-identifier">searchText</span> ) +266: <span class="ruby-identifier">matchesArray</span> = <span class="ruby-identifier">matchesArray</span>.<span class="ruby-identifier">concat</span>( <span class="ruby-identifier">packageName</span>.<span class="ruby-identifier">scan</span>( <span class="ruby-identifier">searchText</span> ) ) +267: +268: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">matchesArray</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">></span> <span class="ruby-value">0</span> ) +269: <span class="ruby-comment cmt"># matches so add to hash.</span> +270: <span class="ruby-identifier">packageHash</span> = <span class="ruby-identifier">packageHash</span>.<span class="ruby-identifier">merge</span>( <span class="ruby-constant">Hash</span>[ <span class="ruby-node">"#{package}"</span> =<span class="ruby-operator">></span> <span class="ruby-node">"#{sw.description}"</span> ] ) +271: <span class="ruby-keyword kw">end</span> +272: <span class="ruby-keyword kw">end</span> +273: <span class="ruby-keyword kw">end</span> +274: } +275: <span class="ruby-keyword kw">end</span> +276: +277: <span class="ruby-comment cmt"># finished search results.</span> +278: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">packageHash</span> +279: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -266,10 +266,10 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000121_source')" id="l_M000121_source">show source</a> ]</p> <div id="M000121_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtreportmanager.rb, line 199</span> -199: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_file_owner</span>( <span class="ruby-identifier">file</span> ) -200: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -201: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtreportmanager.rb, line 233</span> +233: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_file_owner</span>( <span class="ruby-identifier">file</span> ) +234: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +235: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -283,17 +283,51 @@ Display a list of the packages found in the frozen list. </p> <p> -<b>RETURN</b> <em>void.</em> +<b>RETURN</b> <em>hash</em> - a hash of the frozen packages, keys are +package names and values are the frozen timestamps. </p> </div> <div class="sourcecode"> <p class="source-link">[ <a href="javascript:toggleSource('M000117_source')" id="l_M000117_source">show source</a> ]</p> <div id="M000117_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtreportmanager.rb, line 138</span> -138: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_frozen_packages</span> -139: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -140: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtreportmanager.rb, line 139</span> +139: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_frozen_packages</span> +140: +141: <span class="ruby-comment cmt"># determine if there are frozen pacakges.</span> +142: <span class="ruby-identifier">frozenHash</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># has for values found.</span> +143: +144: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">entries</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) <span class="ruby-operator">-</span> [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'..'</span> ] ).<span class="ruby-identifier">empty?</span> +145: <span class="ruby-keyword kw">return</span> <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># empty hash, no entries.</span> +146: <span class="ruby-keyword kw">else</span> +147: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">$PACKAGE_INSTALLED</span> ) { <span class="ruby-operator">|</span><span class="ruby-identifier">package</span><span class="ruby-operator">|</span> +148: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">"."</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">package</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">".."</span>) +149: <span class="ruby-comment cmt"># split the installed entry into two parts,</span> +150: <span class="ruby-comment cmt"># the package name and the version number.</span> +151: <span class="ruby-comment cmt">#packageArray = package.split( "-" )</span> +152: <span class="ruby-comment cmt">#packageName = packageArray[0]</span> +153: +154: <span class="ruby-comment cmt"># check for frozen log file.</span> +155: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{package}/frozen.log"</span> ) ) +156: <span class="ruby-comment cmt"># dump packgae + frozen.log timestamp in packageHash.</span> +157: <span class="ruby-keyword kw">begin</span> +158: <span class="ruby-identifier">file</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{package}/frozen.log"</span>, <span class="ruby-value str">"r"</span>) +159: <span class="ruby-comment cmt">#while (line = file.gets)</span> +160: <span class="ruby-identifier">line</span> = <span class="ruby-identifier">file</span>.<span class="ruby-identifier">gets</span> +161: <span class="ruby-identifier">frozenHash</span> = <span class="ruby-identifier">frozenHash</span>.<span class="ruby-identifier">merge</span>( <span class="ruby-constant">Hash</span>[ <span class="ruby-node">"#{package}"</span> =<span class="ruby-operator">></span> <span class="ruby-node">"#{line}"</span> ] ) +162: <span class="ruby-comment cmt">#end</span> +163: <span class="ruby-identifier">file</span>.<span class="ruby-identifier">close</span> +164: <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">error</span> +165: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Exception: #{error}"</span> +166: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +167: <span class="ruby-keyword kw">end</span> +168: <span class="ruby-keyword kw">end</span> +169: <span class="ruby-keyword kw">end</span> +170: } +171: <span class="ruby-keyword kw">end</span> +172: +173: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">frozenHash</span> +174: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -348,24 +382,24 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000120_source')" id="l_M000120_source">show source</a> ]</p> <div id="M000120_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtreportmanager.rb, line 174</span> -174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_journal</span>( <span class="ruby-identifier">fileName</span> ) -175: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">fileName</span> ) ) -176: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -177: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"AbTLinux log:"</span> -178: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"============="</span> -179: <span class="ruby-identifier">log</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">fileName</span> ) -180: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">each</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> <span class="ruby-identifier">puts</span> <span class="ruby-identifier">entry</span> } -181: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -182: <span class="ruby-keyword kw">else</span> -183: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -184: <span class="ruby-identifier">puts</span> <span class="ruby-node">"AbtLinux log ( #{File.basename( fileName )} ) "</span> <span class="ruby-operator">+</span> -185: <span class="ruby-value str">"is empty at this time."</span> -186: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -187: <span class="ruby-keyword kw">end</span> -188: -189: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -190: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtreportmanager.rb, line 20... [truncated message content] |
From: <esc...@us...> - 2007-12-27 19:11:10
|
Revision: 447 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=447&view=rev Author: eschabell Date: 2007-12-27 11:11:11 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Refactored unit tests and class to properly setup the frozen status of a package for the testing. Furthermore, allow automoted non-user querying build for re-install package method. Modified Paths: -------------- src/trunk/abtpackagemanager.rb src/trunk/testabtpackagemanager.rb Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-27 19:09:13 UTC (rev 446) +++ src/trunk/abtpackagemanager.rb 2007-12-27 19:11:11 UTC (rev 447) @@ -214,11 +214,12 @@ # Reinstalls a given package. # # <b>PARAM</b> <i>String</i> - the name of the package to be reinstalled. + # <b>PARAM</b> <i>Boolean</i> - query the user if false (default), otherwise true and skip query. # # <b>RETURN</b> <i>boolean</i> - True if the package is reinstalled, # otherwise false. ## - def reinstall_package( package ) + def reinstall_package( package, automated_build=false ) logger = Logger.new( $JOURNAL ) # TODO: look into refactoring myLogger: myLogger = AbtLogManager.new @@ -232,20 +233,23 @@ end # check if already installed. - if ( system.package_installed( options['package'] ) ) - puts "\n*** Package #{package} is already installed! ***\n" - puts "Are you sure you want to proceed with a reinstall? (y/n)" + if ( system.package_installed( package ) ) + + if !automated_build + puts "\n*** Package #{package} is already installed! ***\n" + puts "Are you sure you want to proceed with a reinstall? (y/n)" - while answer = STDIN.gets - answer.chomp! - if answer == "y" - break - elsif answer == "n" - exit - else - puts "Are you sure you want to reinstall #{package}? (y/n)" - end - end + while answer = STDIN.gets + answer.chomp! + if answer == "y" + break + elsif answer == "n" + exit + else + puts "Are you sure you want to reinstall #{package}? (y/n)" + end + end + end else puts "\n*** Package #{package} is not installed, we will install it for you now! ***\n" puts "Hit enter to continue..." Modified: src/trunk/testabtpackagemanager.rb =================================================================== --- src/trunk/testabtpackagemanager.rb 2007-12-27 19:09:13 UTC (rev 446) +++ src/trunk/testabtpackagemanager.rb 2007-12-27 19:11:11 UTC (rev 447) @@ -55,6 +55,11 @@ ## def test_install_package if @system.package_installed( "ipc" ) + + if @system.package_frozen( "ipc" ) + @manager.freeze_package( "ipc" ) + end + @manager.remove_package( "ipc" ) end @@ -69,7 +74,11 @@ @manager.install_package( "ipc" ) end - assert( @pkgMgr.reinstall_package( "ipc" ), "test_reinstall_package()" ) + if @system.package_frozen( "ipc" ) + @manager.freeze_package( "ipc" ) + end + + assert( @pkgMgr.reinstall_package( "ipc", true ), "test_reinstall_package()" ) end ## @@ -80,6 +89,10 @@ @manager.install_package( "ipc" ) end + if @system.package_frozen( "ipc" ) + @manager.freeze_package( "ipc" ) + end + assert( @pkgMgr.remove_package( "ipc" ), "test_remove_package()" ) end @@ -90,6 +103,10 @@ if !@system.package_installed( "ipc" ) @manager.install_package( "ipc" ) end + + if @system.package_frozen( "ipc" ) + @manager.freeze_package( "ipc" ) + end assert( @pkgMgr.downgrade_package( "ipc", "1.2" ), "test_downgrade_package()" ) end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-27 19:09:16
|
Revision: 446 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=446&view=rev Author: eschabell Date: 2007-12-27 11:09:13 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Implemented show-frozen package list method. Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtreportmanager.rb src/trunk/testabtreportmanager.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-12-27 13:16:27 UTC (rev 445) +++ src/trunk/abt.rb 2007-12-27 19:09:13 UTC (rev 446) @@ -325,10 +325,31 @@ end when "show-frozen" - # FIXME : show frozen pkg's implementation. - puts "Display all packages frozen at current version." - show.usage( "queries" ) - + if ( ARGV.length == 1 ) + logger.info( "Starting display of frozen packages." ) + frozenResults = reporter.show_frozen_packages + if ( frozenResults.empty? ) + puts "\n\nNothing is frozen at this time.\n\n" + logger.info( "Completed display of frozen packages." ) + exit + else + # we have results hash! + puts "\n\n\t========================" + puts "\tAbTLinux frozen packages" + puts "\t========================" + puts "\nPackage name: \t\tFrozen since:" + puts "============\t\t=============" + frozenResults.each_pair { |name, timestamp| puts "#{name} \t\t#{timestamp}" } + end + + #puts "===========================================" + puts "\n\n" + logger.info( "Completed display of frozen packages." ) + else + show.usage( "queries" ) + exit + end + when "show-untracked" # FIXME : show untracked files implementation. puts "Display all files on system not tracked by AbTLinux." Modified: src/trunk/abtreportmanager.rb =================================================================== --- src/trunk/abtreportmanager.rb 2007-12-27 13:16:27 UTC (rev 445) +++ src/trunk/abtreportmanager.rb 2007-12-27 19:09:13 UTC (rev 446) @@ -133,10 +133,44 @@ ## # Display a list of the packages found in the frozen list. # - # <b>RETURN</b> <i>void.</i> + # <b>RETURN</b> <i>hash</i> - a hash of the frozen packages, keys are package + # names and values are the frozen timestamps. ## def show_frozen_packages - return false + + # determine if there are frozen pacakges. + frozenHash = Hash.new # has for values found. + + if ( Dir.entries( $PACKAGE_INSTALLED ) - [ '.', '..' ] ).empty? + return Hash.new # empty hash, no entries. + else + Dir.foreach( $PACKAGE_INSTALLED ) { |package| + if ( package != "." && package != "..") + # split the installed entry into two parts, + # the package name and the version number. + #packageArray = package.split( "-" ) + #packageName = packageArray[0] + + # check for frozen log file. + if ( File.exist?( "#{$PACKAGE_INSTALLED}/#{package}/frozen.log" ) ) + # dump packgae + frozen.log timestamp in packageHash. + begin + file = File.new("#{$PACKAGE_INSTALLED}/#{package}/frozen.log", "r") + #while (line = file.gets) + line = file.gets + frozenHash = frozenHash.merge( Hash[ "#{package}" => "#{line}" ] ) + #end + file.close + rescue => error + puts "Exception: #{error}" + return false + end + end + end + } + end + + return frozenHash end ## Modified: src/trunk/testabtreportmanager.rb =================================================================== --- src/trunk/testabtreportmanager.rb 2007-12-27 13:16:27 UTC (rev 445) +++ src/trunk/testabtreportmanager.rb 2007-12-27 19:09:13 UTC (rev 446) @@ -90,7 +90,10 @@ @manager.install_package( "ipc" ) end - # TODO: freeze test pacakge. + # ensure test package freeze. + if !@system.package_frozen( "ipc" ) + @manager.freeze_package "ipc" + end assert( @report.show_frozen_packages(), "test_show_frozen_packages()" ) end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-27 13:16:23
|
Revision: 445 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=445&view=rev Author: eschabell Date: 2007-12-27 05:16:27 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Fixed a missing logger object instantiation in the downgrade package method. Modified Paths: -------------- src/trunk/abtpackagemanager.rb Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-26 09:06:20 UTC (rev 444) +++ src/trunk/abtpackagemanager.rb 2007-12-27 13:16:27 UTC (rev 445) @@ -345,6 +345,7 @@ ## def downgrade_package( package, version ) system = AbtSystemManager.new + logger = Logger.new( $JOURNAL ) # check for frozen. if ( system.package_frozen( package ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-26 09:06:36
|
Revision: 444 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=444&view=rev Author: eschabell Date: 2007-12-26 01:06:20 -0800 (Wed, 26 Dec 2007) Log Message: ----------- Refactored reinstall package call to check for frozen before asking to reinstall the package, simplifies output paths. Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtpackagemanager.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-12-25 14:10:46 UTC (rev 443) +++ src/trunk/abt.rb 2007-12-26 09:06:20 UTC (rev 444) @@ -97,37 +97,13 @@ options['package'] = ARGV[1] logger.info( "Starting to reinstall #{options['package']}" ) - # check if already installed. - if ( system.package_installed( options['package'] ) ) - puts "\n*** Package #{options['package']} is already installed! ***\n" - puts "Are you sure you want to proceed with a reinstall? (y/n)" - - while answer = STDIN.gets - answer.chomp! - if answer == "y" - break - elsif answer == "n" - exit - else - puts "Are you sure you want to reinstall #{options['package']}? (y/n)" - end - end - else - puts "\n*** Package #{options['package']} is not installed, we will install it for you now! ***\n" - puts "Hit enter to continue..." - while continue = STDIN.gets - continue.chomp! - break - end - end - - if ( manager.reinstall_package( options['package'] ) ) + if ( manager.reinstall_package( options['package'] ) ) puts "\n\n" puts "*** Completed reinstall of #{options['package']}. ***" puts "\n\n" logger.info( "Completed reinstall of #{options['package']}." ) else - puts "*** #{options['package'].capitalize} reinstall failed, see journal. ***" + puts "\n*** Unable to reinstall package #{options['package'].capitalize}, see why in the journal. ***" end else show.usage( "packages" ) @@ -145,7 +121,7 @@ puts "\n\n" puts "*** No need to remove #{options['package']}, it was not installed! ***" puts "\n\n" - logger.info( "Completed removal of #{options['package']}." ) + logger.info( "Unabel to complete removal of #{options['package']}." ) exit end @@ -154,9 +130,14 @@ puts "\n\n" puts "*** Completed removal of #{options['package']}. ***" puts "\n\n" - logger.info( "Completed removal of #{options['package']}." ) + logger.info( "Unabel to complete removal of #{options['package']}." ) end + + puts "\n*** Unable to completed removal of #{options['package']}, see why in the journal. ***" + logger.info( "Unabel to complete removal of #{options['package']}." ) else + puts "\n*** Unable to completed removal of #{options['package']}, see why in the journal. ***" + logger.info( "Unabel to complete removal of #{options['package']}." ) show.usage( "packages" ) exit end Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-25 14:10:46 UTC (rev 443) +++ src/trunk/abtpackagemanager.rb 2007-12-26 09:06:20 UTC (rev 444) @@ -231,6 +231,30 @@ return false end + # check if already installed. + if ( system.package_installed( options['package'] ) ) + puts "\n*** Package #{package} is already installed! ***\n" + puts "Are you sure you want to proceed with a reinstall? (y/n)" + + while answer = STDIN.gets + answer.chomp! + if answer == "y" + break + elsif answer == "n" + exit + else + puts "Are you sure you want to reinstall #{package}? (y/n)" + end + end + else + puts "\n*** Package #{package} is not installed, we will install it for you now! ***\n" + puts "Hit enter to continue..." + while continue = STDIN.gets + continue.chomp! + break + end + end + if ( install_package( package ) ) puts "\n\n" puts "*** Completed reinstall of #{package}. ***" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-25 14:10:41
|
Revision: 443 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=443&view=rev Author: eschabell Date: 2007-12-25 06:10:46 -0800 (Tue, 25 Dec 2007) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/classes/AbtUsage.html src/trunk/doc/classes/TestAbtPackageManager.html src/trunk/doc/created.rid src/trunk/doc/files/abtpackagemanager_rb.html src/trunk/doc/files/abtsystemmanager_rb.html src/trunk/doc/files/abtusage_rb.html src/trunk/doc/files/testabtpackagemanager_rb.html Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2007-12-25 14:09:47 UTC (rev 442) +++ src/trunk/doc/classes/AbtPackageManager.html 2007-12-25 14:10:46 UTC (rev 443) @@ -182,10 +182,19 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p> <div id="M000047_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 298</span> -298: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgrade_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) -299: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -300: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 322</span> +322: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgrade_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) +323: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +324: +325: <span class="ruby-comment cmt"># check for frozen.</span> +326: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +327: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with downgrade package call."</span> +328: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with downgrade package call."</span> +329: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +330: <span class="ruby-keyword kw">end</span> +331: +332: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +333: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -197,7 +206,7 @@ <div class="description"> <p> Freezes a given package. If successful will add give package to the frozen -list. +list. If the given package is already frozen, it will be released. </p> <p> <b>PARAM</b> <em>String</em> - the name of the package to be frozen. @@ -211,33 +220,37 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000048_source')" id="l_M000048_source">show source</a> ]</p> <div id="M000048_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 311</span> -311: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freeze_package</span>( <span class="ruby-identifier">package</span> ) -312: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> -313: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) -314: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> -315: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -316: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -317: -318: <span class="ruby-comment cmt"># get package details.</span> -319: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> -320: -321: <span class="ruby-comment cmt">#if system.package_installed( package )</span> -322: <span class="ruby-comment cmt"># if system.package_frozen( package )</span> -323: <span class="ruby-comment cmt"># logger.info( "Package #{package} is already frozen!" )</span> -324: <span class="ruby-comment cmt"># return true</span> -325: <span class="ruby-comment cmt"># end</span> -326: -327: <span class="ruby-comment cmt"># FIXME: create file in $PACKAGE_INSTALLED frozen.log with date.</span> -328: <span class="ruby-comment cmt">#frozen = File.open( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log", "w" )</span> -329: <span class="ruby-comment cmt">#frozen.puts "#{$TIMESTAMP}"</span> -330: <span class="ruby-comment cmt">#frozen.close</span> -331: <span class="ruby-comment cmt"># end</span> -332: <span class="ruby-comment cmt">#end</span> -333: -334: <span class="ruby-comment cmt">#logger.info( "Package #{package} is not installed, unable to freeze it." )</span> -335: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -336: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 344</span> +344: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freeze_package</span>( <span class="ruby-identifier">package</span> ) +345: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> +346: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +347: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> +348: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +349: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +350: +351: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) +352: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +353: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is already frozen!"</span> ) +354: +355: <span class="ruby-comment cmt"># package already frozen, need to un-freeze by removing frozen.log</span> +356: <span class="ruby-comment cmt"># file.</span> +357: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span> <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> +358: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} was frozen, it has now been relased for use."</span> +359: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} released : removed file #{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span> +360: <span class="ruby-keyword kw">else</span> +361: <span class="ruby-comment cmt"># place file in $PACKAGE_INSTALLED frozen.log with date.</span> +362: <span class="ruby-identifier">frozen</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log"</span>, <span class="ruby-value str">"w"</span> ) +363: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP}"</span> +364: <span class="ruby-identifier">frozen</span>.<span class="ruby-identifier">close</span> +365: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is now frozen."</span> ) +366: <span class="ruby-keyword kw">end</span> +367: +368: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +369: <span class="ruby-keyword kw">end</span> +370: +371: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Package #{package} is not installed, unable to freeze it."</span> ) +372: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +373: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -270,112 +283,120 @@ 93: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) 94: <span class="ruby-identifier">queuer</span> = <span class="ruby-constant">AbtQueueManager</span>.<span class="ruby-identifier">new</span> 95: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) - 96: - 97: <span class="ruby-comment cmt"># TODO: refactor myLogger:</span> - 98: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> - 99: -100: <span class="ruby-comment cmt"># get package details.</span> -101: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> -102: -103: <span class="ruby-comment cmt"># TODO: check deps</span> -104: -105: <span class="ruby-comment cmt"># add to install queue.</span> -106: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Adding #{package} to the INSTALL QUEUE. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -107: -108: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">queuer</span>.<span class="ruby-identifier">action_package_queue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">"install"</span>, <span class="ruby-value str">"add"</span> ) ) -109: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to add #{package} to install queue."</span> ) -110: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -111: <span class="ruby-keyword kw">end</span> + 96: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> + 97: + 98: <span class="ruby-comment cmt"># TODO: refactor myLogger:</span> + 99: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +100: +101: <span class="ruby-comment cmt"># get package details.</span> +102: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> +103: +104: <span class="ruby-comment cmt"># check for frozen.</span> +105: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +106: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with install package call."</span> +107: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with install package call."</span> +108: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +109: <span class="ruby-keyword kw">end</span> +110: +111: <span class="ruby-comment cmt"># TODO: check deps</span> 112: -113: <span class="ruby-comment cmt"># pre section.</span> -114: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the PRE section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">verbose</span> ) +113: <span class="ruby-comment cmt"># add to install queue.</span> +114: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Adding #{package} to the INSTALL QUEUE. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) 115: -116: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">pre</span> ) -117: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process pre-section in the package description of #{package}."</span> ) +116: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">queuer</span>.<span class="ruby-identifier">action_package_queue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">"install"</span>, <span class="ruby-value str">"add"</span> ) ) +117: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to add #{package} to install queue."</span> ) 118: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -119: <span class="ruby-keyword kw">else</span> -120: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} pre section."</span> ) -121: <span class="ruby-keyword kw">end</span> -122: -123: <span class="ruby-comment cmt"># configure section.</span> -124: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the CONFIGURE section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -125: -126: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">configure</span>( <span class="ruby-identifier">verbose</span> ) ) -127: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process configure section in the package description of #{package}."</span> ) -128: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -129: <span class="ruby-keyword kw">else</span> -130: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} configure section."</span> ) -131: <span class="ruby-keyword kw">end</span> -132: -133: <span class="ruby-comment cmt"># build section.</span> -134: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the BUILD section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -135: -136: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">build</span>( <span class="ruby-identifier">verbose</span> ) ) -137: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process build section in the package description of #{package}."</span> ) -138: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -139: <span class="ruby-keyword kw">else</span> -140: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_build</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) ) -141: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Failed to create a package build log."</span> ) -142: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -143: <span class="ruby-keyword kw">end</span> -144: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} build section."</span> ) -145: <span class="ruby-keyword kw">end</span> -146: -147: <span class="ruby-comment cmt"># preinstall section.</span> -148: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the PREINSTALL section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -149: -150: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">preinstall</span> ) -151: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process preinstall section in the package description of #{package}."</span> ) -152: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -153: <span class="ruby-keyword kw">else</span> -154: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} preinstall section."</span> ) -155: <span class="ruby-keyword kw">end</span> -156: -157: <span class="ruby-comment cmt"># install section.</span> -158: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the INSTALL section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -159: -160: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">install</span> ) -161: <span class="ruby-comment cmt"># rollback installed files if any and remove install log.</span> -162: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process install section in the package description of #{package}."</span> ) -163: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) -164: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"***Starting rollback of #{package} install and removing install log."</span> ) -165: <span class="ruby-identifier">roll_back</span>( <span class="ruby-value str">"install"</span>, <span class="ruby-identifier">details</span> ) -166: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -167: <span class="ruby-keyword kw">else</span> -168: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) -169: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_integrity</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) -170: -171: <span class="ruby-comment cmt"># cleanup tmp files from installwatch.</span> -172: <span class="ruby-constant">File</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-node">"#{$ABT_TMP}/#{details['Source location']}.watch"</span> ) -173: -174: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} install section."</span> ) -175: <span class="ruby-keyword kw">end</span> -176: -177: <span class="ruby-comment cmt"># post section.</span> -178: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the POST section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -179: -180: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">post</span> ) -181: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process post section in the package description of #{package}."</span> ) -182: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -183: <span class="ruby-keyword kw">else</span> -184: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} post section."</span> ) -185: <span class="ruby-keyword kw">end</span> -186: -187: <span class="ruby-comment cmt"># clean out build sources. </span> -188: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Cleaning up the sources for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) -189: -190: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">remove_build</span> ) -191: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to remove the build sources for #{package}."</span> ) -192: <span class="ruby-comment cmt">#return false # commented out as this is not a reason to fail.</span> +119: <span class="ruby-keyword kw">end</span> +120: +121: <span class="ruby-comment cmt"># pre section.</span> +122: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the PRE section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">verbose</span> ) +123: +124: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">pre</span> ) +125: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process pre-section in the package description of #{package}."</span> ) +126: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +127: <span class="ruby-keyword kw">else</span> +128: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} pre section."</span> ) +129: <span class="ruby-keyword kw">end</span> +130: +131: <span class="ruby-comment cmt"># configure section.</span> +132: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the CONFIGURE section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +133: +134: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">configure</span>( <span class="ruby-identifier">verbose</span> ) ) +135: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process configure section in the package description of #{package}."</span> ) +136: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +137: <span class="ruby-keyword kw">else</span> +138: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} configure section."</span> ) +139: <span class="ruby-keyword kw">end</span> +140: +141: <span class="ruby-comment cmt"># build section.</span> +142: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the BUILD section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +143: +144: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">build</span>( <span class="ruby-identifier">verbose</span> ) ) +145: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process build section in the package description of #{package}."</span> ) +146: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +147: <span class="ruby-keyword kw">else</span> +148: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_build</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) ) +149: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Failed to create a package build log."</span> ) +150: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +151: <span class="ruby-keyword kw">end</span> +152: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} build section."</span> ) +153: <span class="ruby-keyword kw">end</span> +154: +155: <span class="ruby-comment cmt"># preinstall section.</span> +156: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the PREINSTALL section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +157: +158: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">preinstall</span> ) +159: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process preinstall section in the package description of #{package}."</span> ) +160: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +161: <span class="ruby-keyword kw">else</span> +162: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} preinstall section."</span> ) +163: <span class="ruby-keyword kw">end</span> +164: +165: <span class="ruby-comment cmt"># install section.</span> +166: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the INSTALL section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +167: +168: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">install</span> ) +169: <span class="ruby-comment cmt"># rollback installed files if any and remove install log.</span> +170: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process install section in the package description of #{package}."</span> ) +171: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) +172: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"***Starting rollback of #{package} install and removing install log."</span> ) +173: <span class="ruby-identifier">roll_back</span>( <span class="ruby-value str">"install"</span>, <span class="ruby-identifier">details</span> ) +174: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +175: <span class="ruby-keyword kw">else</span> +176: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) +177: <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">log_package_integrity</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span> ) +178: +179: <span class="ruby-comment cmt"># cleanup tmp files from installwatch.</span> +180: <span class="ruby-constant">File</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-node">"#{$ABT_TMP}/#{details['Source location']}.watch"</span> ) +181: +182: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} install section."</span> ) +183: <span class="ruby-keyword kw">end</span> +184: +185: <span class="ruby-comment cmt"># post section.</span> +186: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Processing the POST section for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +187: +188: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">post</span> ) +189: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to process post section in the package description of #{package}."</span> ) +190: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +191: <span class="ruby-keyword kw">else</span> +192: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Finished #{package} post section."</span> ) 193: <span class="ruby-keyword kw">end</span> 194: -195: <span class="ruby-comment cmt"># remove pacakge from install queue.</span> -196: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">queuer</span>.<span class="ruby-identifier">action_package_queue</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span>, <span class="ruby-value str">"install"</span>, <span class="ruby-value str">"remove"</span> ) ) -197: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to remove #{sw.name.downcase} from install queue."</span> ) -198: <span class="ruby-keyword kw">end</span> -199: -200: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> <span class="ruby-comment cmt"># install completed!</span> -201: <span class="ruby-keyword kw">end</span> +195: <span class="ruby-comment cmt"># clean out build sources. </span> +196: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\n*** Cleaning up the sources for #{package}. ***"</span> <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">verbose</span> ) +197: +198: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">remove_build</span> ) +199: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to remove the build sources for #{package}."</span> ) +200: <span class="ruby-comment cmt">#return false # commented out as this is not a reason to fail.</span> +201: <span class="ruby-keyword kw">end</span> +202: +203: <span class="ruby-comment cmt"># remove pacakge from install queue.</span> +204: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">queuer</span>.<span class="ruby-identifier">action_package_queue</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">downcase</span>, <span class="ruby-value str">"install"</span>, <span class="ruby-value str">"remove"</span> ) ) +205: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to remove #{sw.name.downcase} from install queue."</span> ) +206: <span class="ruby-keyword kw">end</span> +207: +208: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> <span class="ruby-comment cmt"># install completed!</span> +209: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -400,31 +421,39 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p> <div id="M000045_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 213</span> -213: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstall_package</span>( <span class="ruby-identifier">package</span> ) -214: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -215: <span class="ruby-comment cmt"># TODO: look into refactoring myLogger:</span> -216: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -217: -218: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">install_package</span>( <span class="ruby-identifier">package</span> ) ) -219: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -220: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed reinstall of #{package}. ***"</span> -221: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -222: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Completed reinstall of #{package}."</span> ) -223: -224: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) ) -225: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -226: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed caching of package #{package}. ***"</span> -227: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> -228: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching completed for package #{package}."</span> ) -229: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -230: <span class="ruby-keyword kw">else</span> -231: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching of package #{package} failed."</span>) -232: <span class="ruby-keyword kw">end</span> -233: <span class="ruby-keyword kw">end</span> -234: -235: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -236: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 221</span> +221: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstall_package</span>( <span class="ruby-identifier">package</span> ) +222: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +223: <span class="ruby-comment cmt"># TODO: look into refactoring myLogger:</span> +224: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +225: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +226: +227: <span class="ruby-comment cmt"># check for frozen.</span> +228: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +229: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with reinstall package call."</span> +230: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with reinstall package call."</span> +231: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +232: <span class="ruby-keyword kw">end</span> +233: +234: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">install_package</span>( <span class="ruby-identifier">package</span> ) ) +235: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +236: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed reinstall of #{package}. ***"</span> +237: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +238: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Completed reinstall of #{package}."</span> ) +239: +240: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) ) +241: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +242: <span class="ruby-identifier">puts</span> <span class="ruby-node">"*** Completed caching of package #{package}. ***"</span> +243: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +244: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching completed for package #{package}."</span> ) +245: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +246: <span class="ruby-keyword kw">else</span> +247: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Caching of package #{package} failed."</span>) +248: <span class="ruby-keyword kw">end</span> +249: <span class="ruby-keyword kw">end</span> +250: +251: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +252: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -449,48 +478,56 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p> <div id="M000046_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 246</span> -246: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_package</span>( <span class="ruby-identifier">package</span> ) -247: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> -248: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) -249: <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> -250: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -251: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -252: -253: <span class="ruby-comment cmt"># get package details.</span> -254: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> -255: -256: <span class="ruby-comment cmt"># TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install?</span> -257: -258: <span class="ruby-comment cmt"># remove listings in install log.</span> -259: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) -260: -261: <span class="ruby-comment cmt"># only process install log if it exists, continue on with </span> -262: <span class="ruby-comment cmt"># journal log warning.</span> -263: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) -264: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">installLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> -265: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) -266: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) -267: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed file #{line.chomp} from #{package} install log."</span>) -268: <span class="ruby-keyword kw">else</span> -269: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Unable to remove #{line.chomp} from #{package} install log, does not exist."</span>) -270: <span class="ruby-comment cmt"># do not return false, removed is ok, just put warning in journal log.</span> -271: <span class="ruby-keyword kw">end</span> -272: <span class="ruby-keyword kw">end</span> -273: -274: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed files from #{File.basename( installLog )} for #{package}."</span> ) -275: <span class="ruby-keyword kw">else</span> -276: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Install log missing for #{package}, see journal..."</span> -277: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Install log was missing for #{package}..."</span> ) -278: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"...continuing to remove package from install listing, but might have files still installed on system."</span> ) -279: <span class="ruby-keyword kw">end</span> -280: -281: -282: <span class="ruby-comment cmt"># remove entry in install listing.</span> -283: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">remove_dir</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}"</span> ) -284: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Removed entry from installed packages."</span> ) -285: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -286: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 262</span> +262: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_package</span>( <span class="ruby-identifier">package</span> ) +263: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> +264: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +265: <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> +266: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +267: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +268: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +269: +270: <span class="ruby-comment cmt"># get package details.</span> +271: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> +272: +273: <span class="ruby-comment cmt"># check for frozen.</span> +274: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_frozen</span>( <span class="ruby-identifier">package</span> ) ) +275: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{package} is frozen, can not proceed with remove package call."</span> +276: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nPackage #{package} is frozen, can not proceed with remove package call."</span> +277: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +278: <span class="ruby-keyword kw">end</span> +279: +280: <span class="ruby-comment cmt"># TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install?</span> +281: +282: <span class="ruby-comment cmt"># remove listings in install log.</span> +283: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">myLogger</span>.<span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) +284: +285: <span class="ruby-comment cmt"># only process install log if it exists, continue on with </span> +286: <span class="ruby-comment cmt"># journal log warning.</span> +287: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) +288: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">installLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> +289: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) +290: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm</span>( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">chomp</span> ) +291: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed file #{line.chomp} from #{package} install log."</span>) +292: <span class="ruby-keyword kw">else</span> +293: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Unable to remove #{line.chomp} from #{package} install log, does not exist."</span>) +294: <span class="ruby-comment cmt"># do not return false, removed is ok, just put warning in journal log.</span> +295: <span class="ruby-keyword kw">end</span> +296: <span class="ruby-keyword kw">end</span> +297: +298: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Removed files from #{File.basename( installLog )} for #{package}."</span> ) +299: <span class="ruby-keyword kw">else</span> +300: <span class="ruby-identifier">puts</span> <span class="ruby-node">"Install log missing for #{package}, see journal..."</span> +301: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Install log was missing for #{package}..."</span> ) +302: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"...continuing to remove package from install listing, but might have files still installed on system."</span> ) +303: <span class="ruby-keyword kw">end</span> +304: +305: +306: <span class="ruby-comment cmt"># remove entry in install listing.</span> +307: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">remove_dir</span>( <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}"</span> ) +308: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Removed entry from installed packages."</span> ) +309: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +310: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -514,20 +551,20 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000049_source')" id="l_M000049_source">show source</a> ]</p> <div id="M000049_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 345</span> -345: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) -346: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) -347: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> -348: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> -349: -350: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> -351: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] -352: <span class="ruby-keyword kw">end</span> -353: -354: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) -355: <span class="ruby-identifier">exit</span> -356: <span class="ruby-keyword kw">end</span> -357: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 382</span> +382: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) +383: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) +384: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> +385: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> +386: +387: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> +388: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] +389: <span class="ruby-keyword kw">end</span> +390: +391: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) +392: <span class="ruby-identifier">exit</span> +393: <span class="ruby-keyword kw">end</span> +394: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtUsage.html =================================================================== --- src/trunk/doc/classes/AbtUsage.html 2007-12-25 14:09:47 UTC (rev 442) +++ src/trunk/doc/classes/AbtUsage.html 2007-12-25 14:10:46 UTC (rev 443) @@ -206,13 +206,13 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000040_source')" id="l_M000040_source">show source</a> ]</p> <div id="M000040_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtusage.rb, line 125</span> -125: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usage_downloads</span> -126: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\ndownloads:"</span> -127: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -d, download [package]\t\tRetrieve given package sources."</span> -128: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -u, update [package]|[tree]\tUpdate given package or tree from AbTLinux repository."</span> -129: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -n, news\t\t\t\tDisplays newsfeeds from AbTLinux website.\n"</span> -130: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtusage.rb, line 126</span> +126: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usage_downloads</span> +127: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\ndownloads:"</span> +128: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -d, download [package]\t\tRetrieve given package sources."</span> +129: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -u, update [package]|[tree]\tUpdate given package or tree from AbTLinux repository."</span> +130: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -n, news\t\t\t\tDisplays newsfeeds from AbTLinux website.\n"</span> +131: <span class="ruby-keyword kw">end</s... [truncated message content] |
From: <esc...@us...> - 2007-12-25 14:09:43
|
Revision: 442 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=442&view=rev Author: eschabell Date: 2007-12-25 06:09:47 -0800 (Tue, 25 Dec 2007) Log Message: ----------- Implemented freeze (and second run unfreezes a given package) and unfreeze package, updated usage to reflect new feature usage, and down to 13 unit tests. Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtpackagemanager.rb src/trunk/abtusage.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-12-25 14:08:25 UTC (rev 441) +++ src/trunk/abt.rb 2007-12-25 14:09:47 UTC (rev 442) @@ -176,10 +176,17 @@ when "freeze", "-f" if ( ARGV.length == 2 ) options['package'] = ARGV[1] - # FIXME : freeze package implementation. - puts "Holdinging package : #{options['package']} at current version." + logger.info( "Starting freeze of package : #{options['package']}" ) + puts "\nAttempting to freeze package #{options['package']}." + if ( !manager.freeze_package( options['package'] ) ) + puts "\nUnable to freeze package #{options['package']}, see journal for details." + end + + logger.info( "Completed (un)freeze of package : #{options['package']}" ) + puts "\nCompleted freeze of package : #{options['package']}" else show.usage( "packages" ) + logger.info( "Completed (un)freeze of package : #{options['package']}" ) exit end Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-25 14:08:25 UTC (rev 441) +++ src/trunk/abtpackagemanager.rb 2007-12-25 14:09:47 UTC (rev 442) @@ -93,6 +93,7 @@ sw = eval( "#{package.capitalize}.new" ) queuer = AbtQueueManager.new logger = Logger.new( $JOURNAL ) + system = AbtSystemManager.new # TODO: refactor myLogger: myLogger = AbtLogManager.new @@ -100,6 +101,13 @@ # get package details. details = sw.details + # check for frozen. + if ( system.package_frozen( package ) ) + logger.info "Package #{package} is frozen, can not proceed with install package call." + puts "\nPackage #{package} is frozen, can not proceed with install package call." + return false + end + # TODO: check deps # add to install queue. @@ -109,7 +117,7 @@ logger.info( "Failed to add #{package} to install queue." ) return false end - + # pre section. puts "\n*** Processing the PRE section for #{package}. ***" if (verbose ) @@ -214,7 +222,15 @@ logger = Logger.new( $JOURNAL ) # TODO: look into refactoring myLogger: myLogger = AbtLogManager.new + system = AbtSystemManager.new + # check for frozen. + if ( system.package_frozen( package ) ) + logger.info "Package #{package} is frozen, can not proceed with reinstall package call." + puts "\nPackage #{package} is frozen, can not proceed with reinstall package call." + return false + end + if ( install_package( package ) ) puts "\n\n" puts "*** Completed reinstall of #{package}. ***" @@ -249,10 +265,18 @@ # TODO: refactor myLogger. myLogger = AbtLogManager.new logger = Logger.new( $JOURNAL ) + system = AbtSystemManager.new # get package details. details = sw.details + # check for frozen. + if ( system.package_frozen( package ) ) + logger.info "Package #{package} is frozen, can not proceed with remove package call." + puts "\nPackage #{package} is frozen, can not proceed with remove package call." + return false + end + # TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install? # remove listings in install log. @@ -296,12 +320,21 @@ # false. ## def downgrade_package( package, version ) + system = AbtSystemManager.new + + # check for frozen. + if ( system.package_frozen( package ) ) + logger.info "Package #{package} is frozen, can not proceed with downgrade package call." + puts "\nPackage #{package} is frozen, can not proceed with downgrade package call." + return false + end + return false end ## # Freezes a given package. If successful will add give package to the frozen - # list. + # list. If the given package is already frozen, it will be released. # # <b>PARAM</b> <i>String</i> - the name of the package to be frozen. # @@ -315,23 +348,27 @@ logger = Logger.new( $JOURNAL ) system = AbtSystemManager.new - # get package details. - details = sw.details + if ( system.package_installed( package ) ) + if ( system.package_frozen( package ) ) + logger.info( "Package #{package} is already frozen!" ) - #if system.package_installed( package ) - # if system.package_frozen( package ) - # logger.info( "Package #{package} is already frozen!" ) - # return true - # end + # package already frozen, need to un-freeze by removing frozen.log + # file. + FileUtils.rm "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log" + puts "\nPackage #{package} was frozen, it has now been relased for use." + logger.info "Package #{package} released : removed file #{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log" + else + # place file in $PACKAGE_INSTALLED frozen.log with date. + frozen = File.open( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log", "w" ) + frozen.puts "#{$TIMESTAMP}" + frozen.close + logger.info( "Package #{package} is now frozen." ) + end - # FIXME: create file in $PACKAGE_INSTALLED frozen.log with date. - #frozen = File.open( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log", "w" ) - #frozen.puts "#{$TIMESTAMP}" - #frozen.close - # end - #end + return true + end - #logger.info( "Package #{package} is not installed, unable to freeze it." ) + logger.info( "Package #{package} is not installed, unable to freeze it." ) return false end Modified: src/trunk/abtusage.rb =================================================================== --- src/trunk/abtusage.rb 2007-12-25 14:08:25 UTC (rev 441) +++ src/trunk/abtusage.rb 2007-12-25 14:09:47 UTC (rev 442) @@ -78,6 +78,7 @@ puts " -r, remove [package]\t\tRemove given package." puts " -dg, downgrade [version] [package]\tDowngrade given package to given version." puts " -f, freeze [package]\t\tHolds given package at current version, prevents upgrades.\n" + puts "\t\t\t\t\tIf the given package is already frozen, it will be released.\n" end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-25 14:08:20
|
Revision: 441 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=441&view=rev Author: eschabell Date: 2007-12-25 06:08:25 -0800 (Tue, 25 Dec 2007) Log Message: ----------- Refactored test to check the setup of package to test and to reset to original un-frozen status after testing. Modified Paths: -------------- src/trunk/testabtpackagemanager.rb Modified: src/trunk/testabtpackagemanager.rb =================================================================== --- src/trunk/testabtpackagemanager.rb 2007-12-24 18:14:42 UTC (rev 440) +++ src/trunk/testabtpackagemanager.rb 2007-12-25 14:08:25 UTC (rev 441) @@ -102,7 +102,14 @@ @manager.install_package( "ipc" ) end - assert( @pkgMgr.freeze_package( "ipc" ), "test_freeze_package()" ) + if !@system.package_frozen( "ipc" ) + assert( @pkgMgr.freeze_package( "ipc" ), "test_freeze_package()" ) + + # need to return package to initial state, un-frozen. + @pkgMgr.freeze_package( "ipc" ) + else + assert( true ) + end end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-24 18:14:37
|
Revision: 440 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=440&view=rev Author: eschabell Date: 2007-12-24 10:14:42 -0800 (Mon, 24 Dec 2007) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtDepEngine.html src/trunk/doc/classes/AbtDownloadManager.html src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/classes/AbtPackage.html src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/classes/AbtQueueManager.html src/trunk/doc/classes/AbtReportManager.html src/trunk/doc/classes/AbtSystemManager.html src/trunk/doc/classes/AbtUsage.html src/trunk/doc/classes/TestAbtDepEngine.html src/trunk/doc/classes/TestAbtDownloadManager.html src/trunk/doc/classes/TestAbtLogManager.html src/trunk/doc/classes/TestAbtPackage.html src/trunk/doc/classes/TestAbtPackageManager.html src/trunk/doc/classes/TestAbtQueueManager.html src/trunk/doc/classes/TestAbtReportManager.html src/trunk/doc/classes/TestAbtSystemManager.html src/trunk/doc/created.rid src/trunk/doc/dot/f_0.png src/trunk/doc/dot/f_1.png src/trunk/doc/dot/f_10.png src/trunk/doc/dot/f_11.png src/trunk/doc/dot/f_12.png src/trunk/doc/dot/f_13.png src/trunk/doc/dot/f_14.png src/trunk/doc/dot/f_15.png src/trunk/doc/dot/f_16.png src/trunk/doc/dot/f_2.png src/trunk/doc/dot/f_3.png src/trunk/doc/dot/f_4.png src/trunk/doc/dot/f_5.png src/trunk/doc/dot/f_6.png src/trunk/doc/dot/f_7.png src/trunk/doc/dot/f_8.png src/trunk/doc/dot/f_9.png src/trunk/doc/files/abtdepengine_rb.html src/trunk/doc/files/abtdownloadmanager_rb.html src/trunk/doc/files/abtlogmanager_rb.html src/trunk/doc/files/abtpackage_rb.html src/trunk/doc/files/abtpackagemanager_rb.html src/trunk/doc/files/abtqueuemanager_rb.html src/trunk/doc/files/abtreportmanager_rb.html src/trunk/doc/files/abtsystemmanager_rb.html src/trunk/doc/files/abtusage_rb.html src/trunk/doc/files/testabtdepengine_rb.html src/trunk/doc/files/testabtdownloadmanager_rb.html src/trunk/doc/files/testabtlogmanager_rb.html src/trunk/doc/files/testabtpackage_rb.html src/trunk/doc/files/testabtpackagemanager_rb.html src/trunk/doc/files/testabtqueuemanager_rb.html src/trunk/doc/files/testabtreportmanager_rb.html src/trunk/doc/files/testabtsystemmanager_rb.html src/trunk/doc/fr_method_index.html Modified: src/trunk/doc/classes/AbtDepEngine.html =================================================================== --- src/trunk/doc/classes/AbtDepEngine.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtDepEngine.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,133,98" href="AbtDepEngine.html" alt="AbtDepEngine" /> + <area shape="rect" coords="27,50,125,98" href="AbtDepEngine.html" alt="AbtDepEngine" /> </map> <img src="../dot/f_0.png" usemap="#map" border="0" alt="dot/f_0.png"> </td></tr></table> @@ -118,7 +118,7 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000093">new</a></li> + <li><a href="#M000094">new</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000093"></a><b>new</b>() + <a name="M000094"></a><b>new</b>() </div> <div class="description"> <p> @@ -141,8 +141,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000093_source')" id="l_M000093_source">show source</a> ]</p> - <div id="M000093_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000094_source')" id="l_M000094_source">show source</a> ]</p> + <div id="M000094_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdepengine.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> Modified: src/trunk/doc/classes/AbtDownloadManager.html =================================================================== --- src/trunk/doc/classes/AbtDownloadManager.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtDownloadManager.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,176,98" href="AbtDownloadManager.html" alt="AbtDownloadManager" /> + <area shape="rect" coords="27,50,160,98" href="AbtDownloadManager.html" alt="AbtDownloadManager" /> </map> <img src="../dot/f_1.png" usemap="#map" border="0" alt="dot/f_1.png"> </td></tr></table> @@ -117,13 +117,13 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000011">new</a></li> - <li><a href="#M000014">retrieve_news_feed</a></li> - <li><a href="#M000012">retrieve_package_source</a></li> - <li><a href="#M000013">retrieve_package_tree</a></li> - <li><a href="#M000015">update_package</a></li> - <li><a href="#M000016">update_package_tree</a></li> - <li><a href="#M000017">validated</a></li> + <li><a href="#M000012">new</a></li> + <li><a href="#M000015">retrieve_news_feed</a></li> + <li><a href="#M000013">retrieve_package_source</a></li> + <li><a href="#M000014">retrieve_package_tree</a></li> + <li><a href="#M000016">update_package</a></li> + <li><a href="#M000017">update_package_tree</a></li> + <li><a href="#M000018">validated</a></li> </ul> @@ -134,7 +134,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000011"></a><b>new</b>() + <a name="M000012"></a><b>new</b>() </div> <div class="description"> <p> @@ -148,8 +148,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000011_source')" id="l_M000011_source">show source</a> ]</p> - <div id="M000011_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p> + <div id="M000012_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 42</span> 42: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -161,7 +161,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000014"></a><b>retrieve_news_feed</b>( uri, cleanLog=true ) + <a name="M000015"></a><b>retrieve_news_feed</b>( uri, cleanLog=true ) </div> <div class="description"> <p> @@ -176,8 +176,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p> - <div id="M000014_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p> + <div id="M000015_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 122</span> 122: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve_news_feed</span>( <span class="ruby-identifier">uri</span>, <span class="ruby-identifier">cleanLog</span>=<span class="ruby-keyword kw">true</span> ) @@ -231,7 +231,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000012"></a><b>retrieve_package_source</b>( packageName, destination ) + <a name="M000013"></a><b>retrieve_package_source</b>( packageName, destination ) </div> <div class="description"> <p> @@ -249,8 +249,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p> - <div id="M000012_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p> + <div id="M000013_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 56</span> 56: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve_package_source</span>( <span class="ruby-identifier">packageName</span>, <span class="ruby-identifier">destination</span> ) @@ -277,7 +277,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000013"></a><b>retrieve_package_tree</b>( packageTreeName="AbTLinux" ) + <a name="M000014"></a><b>retrieve_package_tree</b>( packageTreeName="AbTLinux" ) </div> <div class="description"> <p> @@ -293,8 +293,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p> - <div id="M000013_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p> + <div id="M000014_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 83</span> 83: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve_package_tree</span>( <span class="ruby-identifier">packageTreeName</span>=<span class="ruby-value str">"AbTLinux"</span> ) @@ -332,7 +332,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000015"></a><b>update_package</b>( packageName ) + <a name="M000016"></a><b>update_package</b>( packageName ) </div> <div class="description"> <p> @@ -347,8 +347,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p> - <div id="M000015_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p> + <div id="M000016_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 176</span> 176: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package</span>( <span class="ruby-identifier">packageName</span> ) @@ -383,7 +383,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000016"></a><b>update_package_tree</b>( packageTreeName="AbTLinux" ) + <a name="M000017"></a><b>update_package_tree</b>( packageTreeName="AbTLinux" ) </div> <div class="description"> <p> @@ -399,8 +399,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p> - <div id="M000016_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000017_source')" id="l_M000017_source">show source</a> ]</p> + <div id="M000017_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 211</span> 211: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package_tree</span>( <span class="ruby-identifier">packageTreeName</span>=<span class="ruby-value str">"AbTLinux"</span> ) @@ -435,7 +435,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000017"></a><b>validated</b>( hashvalue, path ) + <a name="M000018"></a><b>validated</b>( hashvalue, path ) </div> <div class="description"> <p> @@ -452,8 +452,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000017_source')" id="l_M000017_source">show source</a> ]</p> - <div id="M000017_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000018_source')" id="l_M000018_source">show source</a> ]</p> + <div id="M000018_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 247</span> 247: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validated</span>( <span class="ruby-identifier">hashvalue</span>, <span class="ruby-identifier">path</span> ) Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtLogManager.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,141,98" href="AbtLogManager.html" alt="AbtLogManager" /> + <area shape="rect" coords="27,50,131,98" href="AbtLogManager.html" alt="AbtLogManager" /> </map> <img src="../dot/f_2.png" usemap="#map" border="0" alt="dot/f_2.png"> </td></tr></table> @@ -117,12 +117,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000068">cache_package</a></li> - <li><a href="#M000063">get_log</a></li> - <li><a href="#M000067">log_package_build</a></li> - <li><a href="#M000066">log_package_install</a></li> - <li><a href="#M000065">log_package_integrity</a></li> - <li><a href="#M000064">new</a></li> + <li><a href="#M000069">cache_package</a></li> + <li><a href="#M000064">get_log</a></li> + <li><a href="#M000068">log_package_build</a></li> + <li><a href="#M000067">log_package_install</a></li> + <li><a href="#M000066">log_package_integrity</a></li> + <li><a href="#M000065">new</a></li> </ul> @@ -133,7 +133,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000064"></a><b>new</b>() + <a name="M000065"></a><b>new</b>() </div> <div class="description"> <p> @@ -146,14 +146,14 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000064_source')" id="l_M000064_source">show source</a> ]</p> - <div id="M000064_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000065_source')" id="l_M000065_source">show source</a> ]</p> + <div id="M000065_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 80</span> 80: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> 81: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) 82: [<span class="ruby-identifier">$ABT_LOGS</span>, <span class="ruby-identifier">$ABT_CACHES</span>, <span class="ruby-identifier">$ABT_STATE</span>, <span class="ruby-identifier">$BUILD_LOCATION</span>, <span class="ruby-identifier">$PACKAGE_INSTALLED</span>, -83: <span class="ruby-identifier">$PACKAGE_CACHED</span>, <span class="ruby-identifier">$ABT_TMP</span>, <span class="ruby-identifier">$SOURCES_REPOSITORY</span>].<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span> +83: <span class="ruby-identifier">$PACKAGE_CACHED</span>, <span class="ruby-identifier">$ABT_TMP</span>, <span class="ruby-identifier">$ABT_CONFIG</span>, <span class="ruby-identifier">$ABT_LOCAL_CONFIG</span>, <span class="ruby-identifier">$SOURCES_REPOSITORY</span>].<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span> 84: 85: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">dir</span> ) ) 86: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">dir</span> ) @@ -168,7 +168,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000068"></a><b>cache_package</b>( package ) + <a name="M000069"></a><b>cache_package</b>( package ) </div> <div class="description"> <p> @@ -184,8 +184,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p> - <div id="M000068_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000069_source')" id="l_M000069_source">show source</a> ]</p> + <div id="M000069_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 207</span> 207: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) @@ -271,7 +271,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000063"></a><b>get_log</b>( package, type ) + <a name="M000064"></a><b>get_log</b>( package, type ) </div> <div class="description"> <p> @@ -285,8 +285,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p> - <div id="M000063_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000064_source')" id="l_M000064_source">show source</a> ]</p> + <div id="M000064_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 43</span> 43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">type</span> ) @@ -324,7 +324,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000067"></a><b>log_package_build</b>( package ) + <a name="M000068"></a><b>log_package_build</b>( package ) </div> <div class="description"> <p> @@ -340,8 +340,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p> - <div id="M000067_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p> + <div id="M000068_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 187</span> 187: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_build</span>( <span class="ruby-identifier">package</span> ) @@ -360,7 +360,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000066"></a><b>log_package_install</b>( package ) + <a name="M000067"></a><b>log_package_install</b>( package ) </div> <div class="description"> <p> @@ -376,8 +376,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p> - <div id="M000066_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p> + <div id="M000067_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 139</span> 139: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">package</span> ) @@ -424,7 +424,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000065"></a><b>log_package_integrity</b>( package ) + <a name="M000066"></a><b>log_package_integrity</b>( package ) </div> <div class="description"> <p> @@ -441,8 +441,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000065_source')" id="l_M000065_source">show source</a> ]</p> - <div id="M000065_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p> + <div id="M000066_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 102</span> 102: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_integrity</span>( <span class="ruby-identifier">package</span> ) Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtPackage.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,120,98" href="AbtPackage.html" alt="AbtPackage" /> + <area shape="rect" coords="27,50,115,98" href="AbtPackage.html" alt="AbtPackage" /> </map> <img src="../dot/f_3.png" usemap="#map" border="0" alt="dot/f_3.png"> </td></tr></table> @@ -90,7 +90,7 @@ inheriting from this class (class Fortune < <a href="AbtPackage.html">AbtPackage</a>) one picks up all supported standard functions for the abt <a href="AbtPackage.html">AbtPackage</a> manager to -make use of the <a href="AbtPackage.html#M000026">new</a> <a +make use of the <a href="AbtPackage.html#M000027">new</a> <a href="AbtPackage.html">AbtPackage</a>. </p> <p> @@ -109,7 +109,7 @@ AbTLinux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more <a -href="AbtPackage.html#M000027">details</a>. +href="AbtPackage.html#M000028">details</a>. </p> <p> You should have received a copy of the GNU General Public License along @@ -122,16 +122,16 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000030">build</a></li> - <li><a href="#M000029">configure</a></li> - <li><a href="#M000027">details</a></li> - <li><a href="#M000032">install</a></li> - <li><a href="#M000026">new</a></li> - <li><a href="#M000033">post</a></li> - <li><a href="#M000028">pre</a></li> - <li><a href="#M000031">preinstall</a></li> - <li><a href="#M000034">remove_build</a></li> - <li><a href="#M000025">unpack_sources</a></li> + <li><a href="#M000031">build</a></li> + <li><a href="#M000030">configure</a></li> + <li><a href="#M000028">details</a></li> + <li><a href="#M000033">install</a></li> + <li><a href="#M000027">new</a></li> + <li><a href="#M000034">post</a></li> + <li><a href="#M000029">pre</a></li> + <li><a href="#M000032">preinstall</a></li> + <li><a href="#M000035">remove_build</a></li> + <li><a href="#M000026">unpack_sources</a></li> </ul> @@ -305,20 +305,20 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000026"></a><b>new</b>( data ) + <a name="M000027"></a><b>new</b>( data ) </div> <div class="description"> <p> Constructor for an <a href="AbtPackage.html">AbtPackage</a>, requires all -the packge <a href="AbtPackage.html#M000027">details</a>. +the packge <a href="AbtPackage.html#M000028">details</a>. </p> <p> <b>PARAM</b> <em>Hash</em> - hash containing all package data. </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000026_source')" id="l_M000026_source">show source</a> ]</p> - <div id="M000026_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000027_source')" id="l_M000027_source">show source</a> ]</p> + <div id="M000027_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 147</span> 147: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>( <span class="ruby-identifier">data</span> ) @@ -346,7 +346,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000030"></a><b>build</b>( verbose=true ) + <a name="M000031"></a><b>build</b>( verbose=true ) </div> <div class="description"> <p> @@ -363,8 +363,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p> - <div id="M000030_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p> + <div id="M000031_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 274</span> 274: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -390,13 +390,13 @@ </div> <div class="method"> <div class="title"> - <a name="M000029"></a><b>configure</b>( verbose=true ) + <a name="M000030"></a><b>configure</b>( verbose=true ) </div> <div class="description"> <p> -Here we manage the ./<a href="AbtPackage.html#M000029">configure</a> step +Here we manage the ./<a href="AbtPackage.html#M000030">configure</a> step (or equivalent). We need to give ./<a -href="AbtPackage.html#M000029">configure</a> (or autogen.sh, or whatever) +href="AbtPackage.html#M000030">configure</a> (or autogen.sh, or whatever) the correct options so files are to be placed later in the right directories, so doc files and man pages are all in the same common location, etc. Don‘t forget too that it‘s here where we @@ -412,8 +412,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p> - <div id="M000029_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p> + <div id="M000030_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 246</span> 246: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -439,7 +439,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000027"></a><b>details</b>() + <a name="M000028"></a><b>details</b>() </div> <div class="description"> <p> @@ -452,8 +452,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000027_source')" id="l_M000027_source">show source</a> ]</p> - <div id="M000027_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p> + <div id="M000028_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 172</span> 172: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">details</span> @@ -482,7 +482,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000032"></a><b>install</b>( verbose=true ) + <a name="M000033"></a><b>install</b>( verbose=true ) </div> <div class="description"> <p> @@ -498,8 +498,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p> - <div id="M000032_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p> + <div id="M000033_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 318</span> 318: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -529,7 +529,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000033"></a><b>post</b>( verbose=true ) + <a name="M000034"></a><b>post</b>( verbose=true ) </div> <div class="description"> <p> @@ -546,8 +546,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p> - <div id="M000033_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p> + <div id="M000034_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 350</span> 350: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -560,7 +560,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000028"></a><b>pre</b>( verbose=true ) + <a name="M000029"></a><b>pre</b>( verbose=true ) </div> <div class="description"> <p> @@ -577,8 +577,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p> - <div id="M000028_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p> + <div id="M000029_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 203</span> 203: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">pre</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -615,12 +615,12 @@ </div> <div class="method"> <div class="title"> - <a name="M000031"></a><b>preinstall</b>( verbose=true ) + <a name="M000032"></a><b>preinstall</b>( verbose=true ) </div> <div class="description"> <p> Any actions needed before the installation can occur will happen here, such -as creating <a href="AbtPackage.html#M000026">new</a> user accounts, +as creating <a href="AbtPackage.html#M000027">new</a> user accounts, dealing with existing configuration files, etc. </p> <p> @@ -633,8 +633,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p> - <div id="M000031_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p> + <div id="M000032_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 303</span> 303: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span>( <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -648,11 +648,11 @@ </div> <div class="method"> <div class="title"> - <a name="M000034"></a><b>remove_build</b>() + <a name="M000035"></a><b>remove_build</b>() </div> <div class="description"> <p> -Cleans up this packages source <a href="AbtPackage.html#M000030">build</a> +Cleans up this packages source <a href="AbtPackage.html#M000031">build</a> directory. </p> <p> @@ -661,8 +661,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p> - <div id="M000034_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000035_source')" id="l_M000035_source">show source</a> ]</p> + <div id="M000035_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 361</span> 361: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_build</span> @@ -688,12 +688,12 @@ <div class="sectiontitle">Protected Instance methods</div> <div class="method"> <div class="title"> - <a name="M000025"></a><b>unpack_sources</b>() + <a name="M000026"></a><b>unpack_sources</b>() </div> <div class="description"> <p> Unpacks this packages source file into the standard <a -href="AbtPackage.html#M000030">build</a> location. +href="AbtPackage.html#M000031">build</a> location. </p> <p> <b>RETURNS:</b> <em>boolean</em> - True if the completes sucessfully, @@ -701,8 +701,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000025_source')" id="l_M000025_source">show source</a> ]</p> - <div id="M000025_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000026_source')" id="l_M000026_source">show source</a> ]</p> + <div id="M000026_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackage.rb, line 40</span> 40: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unpack_sources</span> Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtPackageManager.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,168,98" href="AbtPackageManager.html" alt="AbtPackageManager" /> + <area shape="rect" coords="27,50,155,98" href="AbtPackageManager.html" alt="AbtPackageManager" /> </map> <img src="../dot/f_4.png" usemap="#map" border="0" alt="dot/f_4.png"> </td></tr></table> @@ -118,13 +118,13 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000046">downgrade_package</a></li> - <li><a href="#M000047">freeze_package</a></li> - <li><a href="#M000043">install_package</a></li> - <li><a href="#M000042">new</a></li> - <li><a href="#M000044">reinstall_package</a></li> - <li><a href="#M000045">remove_package</a></li> - <li><a href="#M000048">root_login</a></li> + <li><a href="#M000047">downgrade_package</a></li> + <li><a href="#M000048">freeze_package</a></li> + <li><a href="#M000044">install_package</a></li> + <li><a href="#M000043">new</a></li> + <li><a href="#M000045">reinstall_package</a></li> + <li><a href="#M000046">remove_package</a></li> + <li><a href="#M000049">root_login</a></li> </ul> @@ -135,7 +135,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000042"></a><b>new</b>() + <a name="M000043"></a><b>new</b>() </div> <div class="description"> <p> @@ -148,8 +148,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000042_source')" id="l_M000042_source">show source</a> ]</p> - <div id="M000042_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p> + <div id="M000043_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 78</span> 78: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -161,7 +161,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000046"></a><b>downgrade_package</b>( package, version ) + <a name="M000047"></a><b>downgrade_package</b>( package, version ) </div> <div class="description"> <p> @@ -179,8 +179,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p> - <div id="M000046_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p> + <div id="M000047_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 298</span> 298: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgrade_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) @@ -192,7 +192,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000047"></a><b>freeze_package</b>( package ) + <a name="M000048"></a><b>freeze_package</b>( package ) </div> <div class="description"> <p> @@ -208,20 +208,43 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p> - <div id="M000047_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000048_source')" id="l_M000048_source">show source</a> ]</p> + <div id="M000048_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 311</span> 311: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freeze_package</span>( <span class="ruby-identifier">package</span> ) -312: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -313: <span class="ruby-keyword kw">end</span> +312: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}#{package}"</span> +313: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +314: <span class="ruby-identifier">myLogger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># TODO: refactor myLogger.</span> +315: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +316: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +317: +318: <span class="ruby-comment cmt"># get package details.</span> +319: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> +320: +321: <span class="ruby-comment cmt">#if system.package_installed( package )</span> +322: <span class="ruby-comment cmt"># if system.package_frozen( package )</span> +323: <span class="ruby-comment cmt"># logger.info( "Package #{package} is already frozen!" )</span> +324: <span class="ruby-comment cmt"># return true</span> +325: <span class="ruby-comment cmt"># end</span> +326: +327: <span class="ruby-comment cmt"># FIXME: create file in $PACKAGE_INSTALLED frozen.log with date.</span> +328: <span class="ruby-comment cmt">#frozen = File.open( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log", "w" )</span> +329: <span class="ruby-comment cmt">#frozen.puts "#{$TIMESTAMP}"</span> +330: <span class="ruby-comment cmt">#frozen.close</span> +331: <span class="ruby-comment cmt"># end</span> +332: <span class="ruby-comment cmt">#end</span> +333: +334: <span class="ruby-comment cmt">#logger.info( "Package #{package} is not installed, unable to freeze it." )</span> +335: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +336: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000043"></a><b>install_package</b>( package, verbose=true ) + <a name="M000044"></a><b>install_package</b>( package, verbose=true ) </div> <div class="description"> <p> @@ -238,8 +261,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p> - <div id="M000043_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p> + <div id="M000044_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 91</span> 91: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install_package</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">true</span> ) @@ -359,7 +382,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000044"></a><b>reinstall_package</b>( package ) + <a name="M000045"></a><b>reinstall_package</b>( package ) </div> <div class="description"> <p> @@ -374,8 +397,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p> - <div id="M000044_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p> + <div id="M000045_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 213</span> 213: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstall_package</span>( <span class="ruby-identifier">package</span> ) @@ -408,7 +431,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000045"></a><b>remove_package</b>( package ) + <a name="M000046"></a><b>remove_package</b>( package ) </div> <div class="description"> <p> @@ -423,8 +446,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p> - <div id="M000045_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p> + <div id="M000046_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 246</span> 246: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_package</span>( <span class="ruby-identifier">package</span> ) @@ -474,7 +497,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000048"></a><b>root_login</b>( arguments ) + <a name="M000049"></a><b>root_login</b>( arguments ) </div> <div class="description"> <p> @@ -488,23 +511,23 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000048_source')" id="l_M000048_source">show source</a> ]</p> - <div id="M000048_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000049_source')" id="l_M000049_source">show source</a> ]</p> + <div id="M000049_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 322</span> -322: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) -323: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) -324: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> -325: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> -326: -327: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> -328: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] -329: <span class="ruby-keyword kw">end</span> -330: -331: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) -332: <span class="ruby-identifier">exit</span> -333: <span class="ruby-keyword kw">end</span> -334: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtpackagemanager.rb, line 345</span> +345: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">root_login</span>( <span class="ruby-identifier">arguments</span> ) +346: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) +347: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> +348: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> +349: +350: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> +351: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] +352: <span class="ruby-keyword kw">end</span> +353: +354: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) +355: <span class="ruby-identifier">exit</span> +356: <span class="ruby-keyword kw">end</span> +357: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtQueueManager.html =================================================================== --- src/trunk/doc/classes/AbtQueueManager.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtQueueManager.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,157,98" href="AbtQueueManager.html" alt="AbtQueueManager" /> + <area shape="rect" coords="27,50,144,98" href="AbtQueueManager.html" alt="AbtQueueManager" /> </map> <img src="../dot/f_5.png" usemap="#map" border="0" alt="dot/f_5.png"> </td></tr></table> @@ -117,8 +117,8 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000092">action_package_queue</a></li> - <li><a href="#M000091">new</a></li> + <li><a href="#M000093">action_package_queue</a></li> + <li><a href="#M000092">new</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000091"></a><b>new</b>() + <a name="M000092"></a><b>new</b>() </div> <div class="description"> <p> @@ -142,8 +142,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000091_source')" id="l_M000091_source">show source</a> ]</p> - <div id="M000091_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000092_source')" id="l_M000092_source">show source</a> ]</p> + <div id="M000092_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtqueuemanager.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -155,7 +155,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000092"></a><b>action_package_queue</b>( package, queue, action="add" ) + <a name="M000093"></a><b>action_package_queue</b>( package, queue, action="add" ) </div> <div class="description"> <p> @@ -171,8 +171,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000092_source')" id="l_M000092_source">show source</a> ]</p> - <div id="M000092_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000093_source')" id="l_M000093_source">show source</a> ]</p> + <div id="M000093_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtqueuemanager.rb, line 54</span> 54: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">action_package_queue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">queue</span>, <span class="ruby-identifier">action</span>=<span class="ruby-value str">"add"</span> ) Modified: src/trunk/doc/classes/AbtReportManager.html =================================================================== --- src/trunk/doc/classes/AbtReportManager.html 2007-12-24 18:13:34 UTC (rev 439) +++ src/trunk/doc/classes/AbtReportManager.html 2007-12-24 18:14:42 UTC (rev 440) @@ -76,7 +76,7 @@ <div id="content"> <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center"> <map id="map" name="map"> - <area shape="rect" coords="27,50,157,98" href="AbtReportManager.html" alt="AbtReportManager" /> + <area shape="rect" coords="27,50,144,98" href="AbtReportManager.html" alt="AbtReportManager" /> </map> <img src="../dot/f_6.png" usemap="#map" border="0" alt="dot/f_6.png"> </td></tr></table> @@ -117,19 +117,19 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000124">generate_HTML_package_listing</a></li> - <li><a href="#M000112">new</a></li> - <li><a href="#M000121">search_package_descriptions</a></li> - <li><a href="#M000120">show_file_owner</a></li> - <li><a href="#M000116">show_frozen_packages</a></li> - <li><a href="#M000114">show_installed_packages</a></li> - <li><a href="#M000119">show_journal</a></li> - <li><a href="#M000117">show_package_dependencies</a></li> - <li><a href="#M000113">show_package_details</a></li> - <li><a href="#M000115">show_package_log</a></li> - <li><a href="#M000122">show_queue</a></li> - <li><a href="#M000118">show_untracked_files</a></li> - <li><a href="#M000123">show_updates</a></li> + <li><a href="#M000125">generate_HTML_package_listing</a></li> + <li><a href="#M000113">new</a></li> + <li><a href="#M000122">search_package_descriptions</a></li> + <li><a href="#M000121">show_file_owner</a></li> + <li><a href="#M000117">show_frozen_packages</a></li> + <li><a href="#M000115">show_installed_packages</a></li> + <li><a href="#M000120">show_journal</a></li> + <li><a href="#M000118">show_package_dependencies</a></li> + <li><a href="#M000114">show_package_details</a></li> + <li><a href="#M000116">show_package_log</a></li> + <li><a href="#M000123">show_queue</a></li> + <li><a href="#M000119">show_untracked_files</a></li> + <li><a href="#M000124">show_updates</a></li> </ul> @@ -140,7 +140,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000112"></a><b>new</b>() + <a name="M000113"></a><b>new</b>() </div> <div class="description"> <p> @@ -152,8 +152,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000112_source')" id="l_M000112_source">show source</a> ]</p> - <div id="M000112_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000113_source')" id="l_M000113_source">show source</a> ]</p> + <div id="M000113_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 42</span> 42: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -165,7 +165,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000124"></a><b>generate_HTML_package_listing</b>() + <a name="M000125"></a><b>generate_HTML_package_listing</b>() </div> <div class="description"> <p> @@ -176,8 +176,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000124_source')" id="l_M000124_source">show source</a> ]</p> - <div id="M000124_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000125_source')" id="l_M000125_source">show source</a> ]</p> + <div id="M000125_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 296</span> 296: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_HTML_package_listing</span> @@ -189,7 +189,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000121"></a><b>search_package_descriptions</b>( searchText ) + <a name="M000122"></a><b>search_package_descriptions</b>( searchText ) </div> <div class="description"> <p> @@ -205,8 +205,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000121_source')" id="l_M000121_source">show source</a> ]</p> - <div id="M000121_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000122_source')" id="l_M000122_source">show source</a> ]</p> + <div id="M000122_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 212</span> 212: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">search_package_descriptions</span>( <span class="ruby-identifier">searchText</span> ) @@ -249,7 +249,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000120"></a><b>show_file_owner</b>( file ) + <a name="M000121"></a><b>show_file_owner</b>( file ) </div> <div class="description"> <p> @@ -263,8 +263,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000120_source')" id="l_M000120_source">show source</a> ]</p> - <div id="M000120_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000121_source')" id="l_M000121_source">show source</a> ]</p> + <div id="M000121_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 199</span> 199: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_file_owner</span>( <span class="ruby-identifier">file</span> ) @@ -276,7 +276,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000116"></a><b>show_frozen_packages</b>() + <a name="M000117"></a><b>show_frozen_packages</b>() </div> <div class="description"> <p> @@ -287,8 +287,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000116_source')" id="l_M000116_source">show source</a> ]</p> - <div id="M000116_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000117_source')" id="l_M000117_source">show source</a> ]</p> + <div id="M000117_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 138</span> 138: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_frozen_packages</span> @@ -300,7 +300,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000114"></a><b>show_installed_packages</b>() + <a name="M000115"></a><b>show_installed_packages</b>() </div> <div class="description"> <p> @@ -311,8 +311,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000114_source')" id="l_M000114_source">show source</a> ]</p> - <div id="M000114_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000115_source')" id="l_M000115_source">show source</a> ]</p> + <div id="M000115_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 98</span> 98: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_installed_packages</span> @@ -331,7 +331,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000119"></a><b>show_journal</b>( fileName ) + <a name="M000120"></a><b>show_journal</b>( fileName ) </div> <div class="description"> <p> @@ -345,8 +345,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000119_source')" id="l_M000119_source">show source</a> ]</p> - <div id="M000119_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000120_source')" id="l_M000120_source">show source</a> ]</p> + <div id="M000120_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 174</span> 174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_journal</span>( <span class="ruby-identifier">fileName</span> ) @@ -372,7 +372,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000117"></a><b>show_package_dependencies</b>( package ) + <a name="M000118"></a><b>show_package_dependencies</b>( package ) </div> <div class="description"> <p> @@ -389,8 +389,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000117_source')" id="l_M000117_source">show source</a> ]</p> - <div id="M000117_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000118_source')" id="l_M000118_source">show source</a> ]</p> + <div id="M000118_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 152</span> 152: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_package_dependencies</span>( <span class="ruby-identifier">package</span> ) @@ -402,7 +402,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000113"></a><b>show_package_details</b>( package ) + <a name="M000114"></a><b>show_package_details</b>( package ) </div> <div class="description"> <p> @@ -417,8 +417,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000113_source')" id="l_M000113_source">show source</a> ]</p> - <div id="M000113_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000114_source')" id="l_M000114_source">show source</a> ]</p> + <div id="M000114_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File abtreportmanager.rb, line 53</span> 53: <span class="ruby-keyword kw">def</span> <span c... [truncated message content] |
From: <esc...@us...> - 2007-12-24 18:13:39
|
Revision: 439 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=439&view=rev Author: eschabell Date: 2007-12-24 10:13:34 -0800 (Mon, 24 Dec 2007) Log Message: ----------- Started implementation of freeze_package method, commented out code that is work in progress. Time for xmas eve festivities 2007 here. Modified Paths: -------------- src/trunk/abtpackagemanager.rb Modified: src/trunk/abtpackagemanager.rb =================================================================== --- src/trunk/abtpackagemanager.rb 2007-12-24 18:12:33 UTC (rev 438) +++ src/trunk/abtpackagemanager.rb 2007-12-24 18:13:34 UTC (rev 439) @@ -309,6 +309,29 @@ # false. ## def freeze_package( package ) + require "#{$PACKAGE_PATH}#{package}" + sw = eval( "#{package.capitalize}.new" ) + myLogger = AbtLogManager.new # TODO: refactor myLogger. + logger = Logger.new( $JOURNAL ) + system = AbtSystemManager.new + + # get package details. + details = sw.details + + #if system.package_installed( package ) + # if system.package_frozen( package ) + # logger.info( "Package #{package} is already frozen!" ) + # return true + # end + + # FIXME: create file in $PACKAGE_INSTALLED frozen.log with date. + #frozen = File.open( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log", "w" ) + #frozen.puts "#{$TIMESTAMP}" + #frozen.close + # end + #end + + #logger.info( "Package #{package} is not installed, unable to freeze it." ) return false end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-24 18:12:33
|
Revision: 438 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=438&view=rev Author: eschabell Date: 2007-12-24 10:12:33 -0800 (Mon, 24 Dec 2007) Log Message: ----------- Added check for frozen setting on a package. Modified Paths: -------------- src/trunk/abtsystemmanager.rb Modified: src/trunk/abtsystemmanager.rb =================================================================== --- src/trunk/abtsystemmanager.rb 2007-12-24 12:26:30 UTC (rev 437) +++ src/trunk/abtsystemmanager.rb 2007-12-24 18:12:33 UTC (rev 438) @@ -287,7 +287,6 @@ def package_installed( package ) require "#{$PACKAGE_PATH}#{package}" sw = eval( "#{package.capitalize}.new" ) - details = sw.details if ( found_entry( $PACKAGE_INSTALLED, sw.srcDir ) ) return true @@ -296,4 +295,26 @@ return false end + ## + # Checks if the given package is frozen by checking for entry in the + # installed directory (frozen.log file). + # + # <b>PARAM</b> <i>String</i> - Package name. + # + # <b>RETURN</b> <i>boolean</i> - True if package installed, otherwise + # false. + ## + def package_frozen( package ) + require "#{$PACKAGE_PATH}#{package}" + sw = eval( "#{package.capitalize}.new" ) + + # looking for frozen log file. + if ( found_entry( "#{$PACKAGE_INSTALLED}/#{sw.srcDir}", "frozen.log" ) ) + return true + end + + return false + end + + end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-12-24 12:26:28
|
Revision: 437 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=437&view=rev Author: eschabell Date: 2007-12-24 04:26:30 -0800 (Mon, 24 Dec 2007) Log Message: ----------- Added directory setup for configuration files in /etc, also ensured logmanager checking for existence. Modified Paths: -------------- src/trunk/abtconfig.rb src/trunk/abtlogmanager.rb Modified: src/trunk/abtconfig.rb =================================================================== --- src/trunk/abtconfig.rb 2007-09-25 20:43:00 UTC (rev 436) +++ src/trunk/abtconfig.rb 2007-12-24 12:26:30 UTC (rev 437) @@ -46,6 +46,8 @@ $ABT_CACHES = "/var/spool/abt" $ABT_STATE = "/var/state/abt" $ABT_TMP = "/tmp/abt" +$ABT_CONFIG = "/etc/abt" +$ABT_LOCAL_CONFIG = "/etc/abt/local" $ABTNEWS_LOG = "#{$ABT_LOGS}/news.log" $BUILD_LOCATION = "/usr/src" $JOURNAL = "#{$ABT_LOGS}/journal.log" # use logger.info. Modified: src/trunk/abtlogmanager.rb =================================================================== --- src/trunk/abtlogmanager.rb 2007-09-25 20:43:00 UTC (rev 436) +++ src/trunk/abtlogmanager.rb 2007-12-24 12:26:30 UTC (rev 437) @@ -80,7 +80,7 @@ def initialize logger = Logger.new( $JOURNAL ) [$ABT_LOGS, $ABT_CACHES, $ABT_STATE, $BUILD_LOCATION, $PACKAGE_INSTALLED, - $PACKAGE_CACHED, $ABT_TMP, $SOURCES_REPOSITORY].each { |dir| + $PACKAGE_CACHED, $ABT_TMP, $ABT_CONFIG, $ABT_LOCAL_CONFIG, $SOURCES_REPOSITORY].each { |dir| if ( ! File.directory?( dir ) ) FileUtils.mkdir_p( dir ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-09-25 20:42:56
|
Revision: 436 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=436&view=rev Author: eschabell Date: 2007-09-25 13:43:00 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtDownloadManager.html src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/classes/AbtUsage.html src/trunk/doc/classes/TestAbtDownloadManager.html src/trunk/doc/created.rid src/trunk/doc/files/abtdownloadmanager_rb.html src/trunk/doc/files/abtlogmanager_rb.html src/trunk/doc/files/abtusage_rb.html src/trunk/doc/files/testabtdownloadmanager_rb.html Modified: src/trunk/doc/classes/AbtDownloadManager.html =================================================================== --- src/trunk/doc/classes/AbtDownloadManager.html 2007-09-25 20:41:52 UTC (rev 435) +++ src/trunk/doc/classes/AbtDownloadManager.html 2007-09-25 20:43:00 UTC (rev 436) @@ -179,52 +179,52 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p> <div id="M000014_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 126</span> -126: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve_news_feed</span>( <span class="ruby-identifier">uri</span>, <span class="ruby-identifier">cleanLog</span>=<span class="ruby-keyword kw">true</span> ) -127: <span class="ruby-identifier">require</span> <span class="ruby-value str">'net/http'</span> -128: <span class="ruby-identifier">require</span> <span class="ruby-value str">'uri'</span> -129: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/1.0'</span> -130: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/2.0'</span> -131: <span class="ruby-identifier">newsLog</span> = <span class="ruby-value str">""</span> -132: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span>) -133: -134: <span class="ruby-comment cmt"># ensure we have our news logfile.</span> -135: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">cleanLog</span> ) -136: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</span>, <span class="ruby-value str">"w+"</span> ) -137: <span class="ruby-keyword kw">else</span> -138: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</span>, <span class="ruby-value str">"a+"</span> ) -139: <span class="ruby-keyword kw">end</span> -140: -141: <span class="ruby-comment cmt"># pick up the abtlinux.org news feed.</span> -142: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">news</span> = <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>( <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>( <span class="ruby-identifier">uri</span> ) ) ) -143: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to retrieve news feed #{uri}."</span> ) -144: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -145: <span class="ruby-keyword kw">end</span> -146: -147: <span class="ruby-comment cmt"># display the feeds.</span> -148: <span class="ruby-identifier">rss</span> = <span class="ruby-keyword kw">nil</span> -149: <span class="ruby-keyword kw">begin</span> -150: <span class="ruby-identifier">rss</span> = <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">news</span>, <span class="ruby-keyword kw">false</span>) -151: <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> -152: <span class="ruby-keyword kw">end</span> -153: -154: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">nil?</span> ) -155: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to display news feed as feed #{uri} is not RSS 1.0/2.0."</span> ) -156: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -157: <span class="ruby-keyword kw">else</span> -158: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"*** #{rss.channel.title} ***\n"</span> -159: -160: <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">items</span>.<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">item</span>, <span class="ruby-identifier">itemCount</span><span class="ruby-operator">|</span> -161: <span class="ruby-identifier">itemCount</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> -162: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{itemCount} #{item.link} #{item.title}\n"</span> -163: <span class="ruby-keyword kw">end</span> -164: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 122</span> +122: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve_news_feed</span>( <span class="ruby-identifier">uri</span>, <span class="ruby-identifier">cleanLog</span>=<span class="ruby-keyword kw">true</span> ) +123: <span class="ruby-identifier">require</span> <span class="ruby-value str">'net/http'</span> +124: <span class="ruby-identifier">require</span> <span class="ruby-value str">'uri'</span> +125: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/1.0'</span> +126: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/2.0'</span> +127: <span class="ruby-identifier">newsLog</span> = <span class="ruby-value str">""</span> +128: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span>) +129: +130: <span class="ruby-comment cmt"># ensure we have our news logfile.</span> +131: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">cleanLog</span> ) +132: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</span>, <span class="ruby-value str">"w+"</span> ) +133: <span class="ruby-keyword kw">else</span> +134: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</span>, <span class="ruby-value str">"a+"</span> ) +135: <span class="ruby-keyword kw">end</span> +136: +137: <span class="ruby-comment cmt"># pick up the abtlinux.org news feed.</span> +138: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">news</span> = <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>( <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>( <span class="ruby-identifier">uri</span> ) ) ) +139: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to retrieve news feed #{uri}."</span> ) +140: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +141: <span class="ruby-keyword kw">end</span> +142: +143: <span class="ruby-comment cmt"># display the feeds.</span> +144: <span class="ruby-identifier">rss</span> = <span class="ruby-keyword kw">nil</span> +145: <span class="ruby-keyword kw">begin</span> +146: <span class="ruby-identifier">rss</span> = <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">news</span>, <span class="ruby-keyword kw">false</span>) +147: <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> +148: <span class="ruby-keyword kw">end</span> +149: +150: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">nil?</span> ) +151: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-node">"Failed to display news feed as feed #{uri} is not RSS 1.0/2.0."</span> ) +152: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +153: <span class="ruby-keyword kw">else</span> +154: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"*** #{rss.channel.title} ***\n"</span> +155: +156: <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">items</span>.<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">item</span>, <span class="ruby-identifier">itemCount</span><span class="ruby-operator">|</span> +157: <span class="ruby-identifier">itemCount</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> +158: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{itemCount} #{item.link} #{item.title}\n"</span> +159: <span class="ruby-keyword kw">end</span> +160: <span class="ruby-keyword kw">end</span> +161: +162: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-value str">"\n\n"</span> +163: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">close</span> +164: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> 165: -166: <span class="ruby-identifier">newsLog</span> <span class="ruby-operator"><<</span> <span class="ruby-value str">"\n\n"</span> -167: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">close</span> -168: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -169: -170: <span class="ruby-keyword kw">end</span> +166: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -304,39 +304,35 @@ 87: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$PACKAGE_PATH</span> ) 88: <span class="ruby-comment cmt"># check if svn directory.</span> 89: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}.svn"</span> ) - 90: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">system</span>( <span class="ruby-node">"svn update #{$PACKAGE_PATH}"</span> ) - 91: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-value str">"Package tree updated (svn update)"</span> - 92: <span class="ruby-keyword kw">else</span> - 93: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree unable to update (svn update)."</span> - 94: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> - 95: <span class="ruby-keyword kw">end</span> - 96: <span class="ruby-keyword kw">else</span> - 97: <span class="ruby-comment cmt"># package directory exists, but is not a valid tree.</span> - 98: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree exists, but is not valid svn tree."</span> - 99: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -100: <span class="ruby-keyword kw">end</span> -101: -102: <span class="ruby-keyword kw">else</span> -103: -104: <span class="ruby-comment cmt"># pacakge directory does not exist, svn co.</span> -105: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">system</span>( <span class="ruby-node">"svn co #{$ABTLINUX_PACKAGES} #{$PACKAGE_PATH}"</span> ) -106: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-value str">"Package tree installed (svn co)"</span> -107: <span class="ruby-keyword kw">else</span> -108: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree not installed (svn co), problems!"</span> -109: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -110: <span class="ruby-keyword kw">end</span> -111: -112: <span class="ruby-keyword kw">end</span> -113: -114: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -115: <span class="ruby-keyword kw">end</span> + 90: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package tree #{packageTreeName} already installed."</span> + 91: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> + 92: <span class="ruby-keyword kw">else</span> + 93: <span class="ruby-comment cmt"># package directory exists, but is not a valid tree.</span> + 94: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree exists, but is not valid svn tree."</span> + 95: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> + 96: <span class="ruby-keyword kw">end</span> + 97: + 98: <span class="ruby-keyword kw">else</span> + 99: +100: <span class="ruby-comment cmt"># pacakge directory does not exist, svn co.</span> +101: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">system</span>( <span class="ruby-node">"svn co #{$ABTLINUX_PACKAGES} #{$PACKAGE_PATH}"</span> ) +102: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-value str">"Package tree installed (svn co)"</span> +103: <span class="ruby-keyword kw">else</span> +104: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree not installed (svn co), problems!"</span> +105: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +106: <span class="ruby-keyword kw">end</span> +107: +108: <span class="ruby-keyword kw">end</span> +109: +110: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +111: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000015"></a><b>update_package</b>() + <a name="M000015"></a><b>update_package</b>( packageName ) </div> <div class="description"> <p> @@ -354,22 +350,50 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p> <div id="M000015_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 180</span> -180: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package</span> -181: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 176</span> +176: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package</span>( <span class="ruby-identifier">packageName</span> ) +177: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>) +178: +179: <span class="ruby-comment cmt"># check if package exists in tree. </span> +180: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exists?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}/#{packageName}.rb"</span> ) +181: <span class="ruby-comment cmt"># check if svn directory.</span> +182: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}.svn"</span> ) +183: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">system</span>( <span class="ruby-node">"svn update #{$PACKAGE_PATH}/#{packageName.downcase}.rb"</span> ) +184: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-node">"Package #{packageName.downcase} updated (svn update)"</span> +185: <span class="ruby-keyword kw">else</span> +186: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-node">"Package #{packageName.downcase} unable to update (svn update)."</span> +187: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +188: <span class="ruby-keyword kw">end</span> +189: <span class="ruby-keyword kw">else</span> +190: <span class="ruby-comment cmt"># package exists, but not an valid tree.</span> +191: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-node">"Package #{packageName} exists, but not valid package tree (svn)."</span> +192: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +193: <span class="ruby-keyword kw">end</span> +194: <span class="ruby-keyword kw">else</span> +195: <span class="ruby-comment cmt"># package does not exist.</span> +196: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package is not installed, not possible to update!"</span> +197: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +198: <span class="ruby-keyword kw">end</span> +199: +200: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +201: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000016"></a><b>update_package_tree</b>() + <a name="M000016"></a><b>update_package_tree</b>( packageTreeName="AbTLinux" ) </div> <div class="description"> <p> Updates the package tree. </p> <p> +<b>PARAM</b> <em>String</em> - the name of the tree to be updated, defaults +to AbTLinux repo. +</p> +<p> <b>RETURN</b> <em>boolean</em> - True if the package tree has been updated, otherwise false. </p> @@ -378,9 +402,33 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p> <div id="M000016_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 189</span> -189: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package_tree</span> -190: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 211</span> +211: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package_tree</span>( <span class="ruby-identifier">packageTreeName</span>=<span class="ruby-value str">"AbTLinux"</span> ) +212: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>) +213: +214: <span class="ruby-comment cmt"># check if package tree exists.</span> +215: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$PACKAGE_PATH</span> ) +216: <span class="ruby-comment cmt"># check if svn directory.</span> +217: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-node">"#{$PACKAGE_PATH}.svn"</span> ) +218: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">system</span>( <span class="ruby-node">"svn update #{$PACKAGE_PATH}"</span> ) +219: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span> <span class="ruby-value str">"Package tree updated (svn update)"</span> +220: <span class="ruby-keyword kw">else</span> +221: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree unable to update (svn update)."</span> +222: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +223: <span class="ruby-keyword kw">end</span> +224: <span class="ruby-keyword kw">else</span> +225: <span class="ruby-comment cmt"># package directory exists, but is not a valid tree.</span> +226: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree exists, but is not valid svn tree."</span> +227: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +228: <span class="ruby-keyword kw">end</span> +229: <span class="ruby-keyword kw">else</span> +230: <span class="ruby-comment cmt"># package directory does not exist.</span> +231: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span> <span class="ruby-value str">"Package tree not installed!"</span> +232: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +233: <span class="ruby-keyword kw">end</span> +234: +235: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +236: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -407,20 +455,20 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000017_source')" id="l_M000017_source">show source</a> ]</p> <div id="M000017_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 201</span> -201: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validated</span>( <span class="ruby-identifier">hashvalue</span>, <span class="ruby-identifier">path</span> ) -202: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) -203: -204: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">hashvalue</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Digest</span><span class="ruby-operator">::</span><span class="ruby-constant">SHA1</span>.<span class="ruby-identifier">hexdigest</span>( <span class="ruby-identifier">path</span> ) -205: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Source hash validated successfully..."</span> -206: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Validated sources successfully..."</span> ) -207: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -208: <span class="ruby-keyword kw">end</span> -209: -210: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Source hash failed validation..."</span> -211: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Validating sources failed..."</span> ) -212: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -213: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtdownloadmanager.rb, line 247</span> +247: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validated</span>( <span class="ruby-identifier">hashvalue</span>, <span class="ruby-identifier">path</span> ) +248: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span> ) +249: +250: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">hashvalue</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Digest</span><span class="ruby-operator">::</span><span class="ruby-constant">SHA1</span>.<span class="ruby-identifier">hexdigest</span>( <span class="ruby-identifier">path</span> ) +251: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Source hash validated successfully..."</span> +252: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Validated sources successfully..."</span> ) +253: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +254: <span class="ruby-keyword kw">end</span> +255: +256: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"Source hash failed validation..."</span> +257: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>( <span class="ruby-value str">"Validating sources failed..."</span> ) +258: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +259: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2007-09-25 20:41:52 UTC (rev 435) +++ src/trunk/doc/classes/AbtLogManager.html 2007-09-25 20:43:00 UTC (rev 436) @@ -187,84 +187,84 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p> <div id="M000068_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtlogmanager.rb, line 210</span> -210: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) -211: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -212: -213: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) -214: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) -215: <span class="ruby-identifier">cachedDir</span> = <span class="ruby-identifier">$PACKAGE_CACHED</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcDir</span> -216: <span class="ruby-identifier">sourcePath</span> = <span class="ruby-identifier">$SOURCES_REPOSITORY</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcUrl</span> ) -217: <span class="ruby-identifier">sourceFile</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcUrl</span> ) -218: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) -219: <span class="ruby-identifier">buildLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'build'</span> ) -220: <span class="ruby-identifier">configureLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'configure'</span> ) -221: <span class="ruby-identifier">integrityLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'integrity'</span> ) -222: <span class="ruby-identifier">packageFile</span> = <span class="ruby-node">"#{$PACKAGE_PATH}#{package}.rb"</span> -223: -224: -225: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">cachedDir</span> ) -226: -227: <span class="ruby-comment cmt"># collect package source.</span> -228: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">sourcePath</span> ) ) -229: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">sourcePath</span>, <span class="ruby-node">"#{cachedDir}/#{sourceFile}"</span> ) -230: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} source."</span> -231: <span class="ruby-keyword kw">else</span> -232: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} source."</span> -233: <span class="ruby-keyword kw">end</span> -234: -235: <span class="ruby-comment cmt"># collect package install log. </span> -236: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) ) -237: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">installLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.install"</span> ) -238: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} install log."</span> -239: <span class="ruby-keyword kw">else</span> -240: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} install log."</span> -241: <span class="ruby-keyword kw">end</span> -242: -243: <span class="ruby-comment cmt"># collect package build log. </span> -244: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">buildLog</span> ) ) -245: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">buildLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.build"</span> ) -246: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} build log."</span> -247: <span class="ruby-keyword kw">else</span> -248: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} build log."</span> -249: <span class="ruby-keyword kw">end</span> -250: -251: <span class="ruby-comment cmt"># collect package configure log. </span> -252: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">configureLog</span> ) ) -253: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">configureLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.configure"</span> ) -254: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} configure log."</span> -255: <span class="ruby-keyword kw">else</span> -256: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} configure log."</span> -257: <span class="ruby-keyword kw">end</span> -258: -259: <span class="ruby-comment cmt"># collect package integrity log.</span> -260: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">integrityLog</span> ) ) -261: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">integrityLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.integrity"</span> ) -262: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} integrity log."</span> -263: <span class="ruby-keyword kw">else</span> -264: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} integrity log."</span> -265: <span class="ruby-keyword kw">end</span> -266: -267: <span class="ruby-comment cmt"># collect package description (class file).</span> -268: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">packageFile</span> ) ) -269: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">packageFile</span>, <span class="ruby-node">"#{cachedDir}/#{package}.rb"</span> ) -270: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} package description."</span> -271: <span class="ruby-keyword kw">else</span> -272: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} package description, from location #{packageFile}"</span> -273: <span class="ruby-keyword kw">end</span> -274: -275: <span class="ruby-comment cmt"># tar and bzip this directory (package-cache-version.tar.bz2) </span> -276: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">$PACKAGE_CACHED</span> ) -277: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>( <span class="ruby-node">"tar -cf #{sw.srcDir}.tar #{sw.srcDir}"</span> ) <span class="ruby-operator">&&</span> -278: <span class="ruby-identifier">system</span>( <span class="ruby-node">"bzip2 -f #{sw.srcDir}.tar"</span> ) ) -279: <span class="ruby-comment cmt"># last but not least, remove our tarball directory</span> -280: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>( <span class="ruby-identifier">cachedDir</span> ) -281: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -282: <span class="ruby-keyword kw">end</span> -283: <span class="ruby-keyword kw">end</span> -284: -285: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># package not installed, can't cache it.</span> -286: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtlogmanager.rb, line 207</span> +207: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cache_package</span>( <span class="ruby-identifier">package</span> ) +208: <span class="ruby-identifier">system</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> +209: +210: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>.<span class="ruby-identifier">package_installed</span>( <span class="ruby-identifier">package</span> ) ) +211: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +212: <span class="ruby-identifier">cachedDir</span> = <span class="ruby-identifier">$PACKAGE_CACHED</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcDir</span> +213: <span class="ruby-identifier">sourcePath</span> = <span class="ruby-identifier">$SOURCES_REPOSITORY</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcUrl</span> ) +214: <span class="ruby-identifier">sourceFile</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">srcUrl</span> ) +215: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) +216: <span class="ruby-identifier">buildLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'build'</span> ) +217: <span class="ruby-identifier">configureLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'configure'</span> ) +218: <span class="ruby-identifier">integrityLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'integrity'</span> ) +219: <span class="ruby-identifier">packageFile</span> = <span class="ruby-node">"#{$PACKAGE_PATH}#{package}.rb"</span> +220: +221: +222: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">cachedDir</span> ) +223: +224: <span class="ruby-comment cmt"># collect package source.</span> +225: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">sourcePath</span> ) ) +226: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">sourcePath</span>, <span class="ruby-node">"#{cachedDir}/#{sourceFile}"</span> ) +227: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} source."</span> +228: <span class="ruby-keyword kw">else</span> +229: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} source."</span> +230: <span class="ruby-keyword kw">end</span> +231: +232: <span class="ruby-comment cmt"># collect package install log. </span> +233: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">installLog</span> ) ) +234: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">installLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.install"</span> ) +235: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} install log."</span> +236: <span class="ruby-keyword kw">else</span> +237: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} install log."</span> +238: <span class="ruby-keyword kw">end</span> +239: +240: <span class="ruby-comment cmt"># collect package build log. </span> +241: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">buildLog</span> ) ) +242: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">buildLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.build"</span> ) +243: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} build log."</span> +244: <span class="ruby-keyword kw">else</span> +245: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} build log."</span> +246: <span class="ruby-keyword kw">end</span> +247: +248: <span class="ruby-comment cmt"># collect package configure log. </span> +249: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">configureLog</span> ) ) +250: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">configureLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.configure"</span> ) +251: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} configure log."</span> +252: <span class="ruby-keyword kw">else</span> +253: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} configure log."</span> +254: <span class="ruby-keyword kw">end</span> +255: +256: <span class="ruby-comment cmt"># collect package integrity log.</span> +257: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">integrityLog</span> ) ) +258: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">integrityLog</span>, <span class="ruby-node">"#{cachedDir}/#{sw.srcDir}.integrity"</span> ) +259: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} integrity log."</span> +260: <span class="ruby-keyword kw">else</span> +261: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} integrity log."</span> +262: <span class="ruby-keyword kw">end</span> +263: +264: <span class="ruby-comment cmt"># collect package description (class file).</span> +265: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">FileTest</span><span class="ruby-operator">::</span><span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">packageFile</span> ) ) +266: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">copy_file</span>( <span class="ruby-identifier">packageFile</span>, <span class="ruby-node">"#{cachedDir}/#{package}.rb"</span> ) +267: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nCaching copy of #{package} package description."</span> +268: <span class="ruby-keyword kw">else</span> +269: <span class="ruby-identifier">puts</span> <span class="ruby-node">"\nUnable to cache copy of #{package} package description, from location #{packageFile}"</span> +270: <span class="ruby-keyword kw">end</span> +271: +272: <span class="ruby-comment cmt"># tar and bzip this directory (package-cache-version.tar.bz2) </span> +273: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">$PACKAGE_CACHED</span> ) +274: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>( <span class="ruby-node">"tar -cf #{sw.srcDir}.tar #{sw.srcDir}"</span> ) <span class="ruby-operator">&&</span> +275: <span class="ruby-identifier">system</span>( <span class="ruby-node">"bzip2 -f #{sw.srcDir}.tar"</span> ) ) +276: <span class="ruby-comment cmt"># last but not least, remove our tarball directory</span> +277: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>( <span class="ruby-identifier">cachedDir</span> ) +278: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +279: <span class="ruby-keyword kw">end</span> +280: <span class="ruby-keyword kw">end</span> +281: +282: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># package not installed, can't cache it.</span> +283: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -343,17 +343,17 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p> <div id="M000067_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtlogmanager.rb, line 190</span> -190: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_build</span>( <span class="ruby-identifier">package</span> ) -191: <span class="ruby-identifier">buildLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'build'</span> ) -192: -193: <span class="ruby-comment cmt"># make sure the build file exists.</span> -194: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">buildLog</span> ) ) -195: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -196: <span class="ruby-keyword kw">end</span> -197: -198: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -199: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtlogmanager.rb, line 187</span> +187: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_build</span>( <span class="ruby-identifier">package</span> ) +188: <span class="ruby-identifier">buildLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'build'</span> ) +189: +190: <span class="ruby-comment cmt"># make sure the build file exists.</span> +191: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">buildLog</span> ) ) +192: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +193: <span class="ruby-keyword kw">end</span> +194: +195: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +196: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -379,45 +379,45 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p> <div id="M000066_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File abtlogmanager.rb, line 142</span> -142: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">package</span> ) -143: <span class="ruby-comment cmt"># some dirs we will not add to an install log.</span> -144: <span class="ruby-identifier">excluded_pattern</span> = <span class="ruby-constant">Regexp</span>.<span class="ruby-identifier">new</span>( <span class="ruby-value str">"^(/dev|/proc|/tmp|/var/tmp|/usr/src|/sys)+"</span> ) -145: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># used to mark excluded lines from installwatch log.</span> -146: -147: <span class="ruby-comment cmt"># our log locations.</span> -148: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) -149: <span class="ruby-identifier">tmpInstallLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'tmpinstall'</span> ) -150: -151: <span class="ruby-comment cmt"># get the installed files from the tmp file</span> -152: <span class="ruby-comment cmt"># into our install log.</span> -153: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">tmpInstallLog</span> ) ) -154: <span class="ruby-identifier">installFile</span> = <span class="ruby-identifier">open</span>( <span class="ruby-identifier">installLog</span>, <span class="ruby-value str">'w'</span>) -155: -156: <span class="ruby-comment cmt"># include only the file names from open calls</span> -157: <span class="ruby-comment cmt"># and not part of the excluded range of directories.</span> -158: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">tmpInstallLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> -159: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value str">'open'</span> ) -160: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">=~</span> <span class="ruby-identifier">excluded_pattern</span> ) -161: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">true</span> -162: <span class="ruby-keyword kw">else</span> -163: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">false</span> -164: <span class="ruby-keyword kw">end</span> -165: -166: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">badLine</span> ) -167: <span class="ruby-identifier">installFile</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{line.split[2]}\n"</span> -168: <span class="ruby-keyword kw">end</span> -169: <span class="ruby-keyword kw">end</span> -170: <span class="ruby-keyword kw">end</span> -171: -172: <span class="ruby-identifier">installFile</span>.<span class="ruby-identifier">close</span> -173: <span class="ruby-keyword kw">else</span> -174: <span class="ruby-comment cmt"># no tmp install file, thus no install running.</span> -175: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -176: <span class="ruby-keyword kw">end</span> -177: -178: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>; -179: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File abtlogmanager.rb, line 139</span> +139: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_install</span>( <span class="ruby-identifier">package</span> ) +140: <span class="ruby-comment cmt"># some dirs we will not add to an install log.</span> +141: <span class="ruby-identifier">excluded_pattern</span> = <span class="ruby-constant">Regexp</span>.<span class="ruby-identifier">new</span>( <span class="ruby-value str">"^(/dev|/proc|/tmp|/var/tmp|/usr/src|/sys)+"</span> ) +142: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># used to mark excluded lines from installwatch log.</span> +143: +144: <span class="ruby-comment cmt"># our log locations.</span> +145: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) +146: <span class="ruby-identifier">tmpInstallLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'tmpinstall'</span> ) +147: +148: <span class="ruby-comment cmt"># get the installed files from the tmp file</span> +149: <span class="ruby-comment cmt"># into our install log.</span> +150: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">tmpInstallLog</span> ) ) +151: <span class="ruby-identifier">installFile</span> = <span class="ruby-identifier">open</span>( <span class="ruby-identifier">installLog</span>, <span class="ruby-value str">'w'</span>) +152: +153: <span class="ruby-comment cmt"># include only the file names from open calls</span> +154: <span class="ruby-comment cmt"># and not part of the excluded range of directories.</span> +155: <span class="ruby-constant">IO</span>.<span class="ruby-identifier">foreach</span>( <span class="ruby-identifier">tmpInstallLog</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span> +156: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value str">'open'</span> ) +157: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">=~</span> <span class="ruby-identifier">excluded_pattern</span> ) +158: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">true</span> +159: <span class="ruby-keyword kw">else</span> +160: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">false</span> +161: <span class="ruby-keyword kw">end</span> +162: +163: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">badLine</span> ) +164: <span class="ruby-identifier">installFile</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{line.split[2]}\n"</span> +165: <span class="ruby-keyword kw">end</span> +166: <span class="ruby-keyword kw">end</span> +167: <span class="ruby-keyword kw">end</span> +168: +169: <span class="ruby-identifier">installFile</span>.<span class="ruby-identifier">close</span> +170: <span class="ruby-keyword kw">else</span> +171: <span class="ruby-comment cmt"># no tmp install file, thus no install running.</span> +172: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +173: <span class="ruby-keyword kw">end</span> +174: +175: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>; +176: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -446,35 +446,32 @@ <pre> <span class="ruby-comment cmt"># File abtlogmanager.rb, line 102</span> 102: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_integrity</span>( <span class="ruby-identifier">package</span> ) -103: <span class="ruby-comment cmt">#require "#{$PACKAGE_PATH}#{package}"</span> -104: <span class="ruby-comment cmt">#sw = eval( "#{package.capitalize}.new" )</span> -105: <span class="ruby-comment cmt">#details = sw.details</span> -106: -107: <span class="ruby-comment cmt"># our log locations.</span> -108: <span class="ruby-identifier">installLog</span> = <span class="ruby-identifier">get_log</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">'install'</span> ) -109: <span class="ruby-identifier">integrityLog<... [truncated message content] |
From: <esc...@us...> - 2007-09-25 20:41:51
|
Revision: 435 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=435&view=rev Author: eschabell Date: 2007-09-25 13:41:52 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Refactored update package and package tree implementations to use the correct abt function call. Not passing two more unit tests, 14 to go! Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtdownloadmanager.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-09-25 20:40:23 UTC (rev 434) +++ src/trunk/abt.rb 2007-09-25 20:41:52 UTC (rev 435) @@ -421,12 +421,50 @@ when "update", "-u" if ( ARGV.length == 2 ) - options['updateItem'] = ARGV[1] - # FIXME : update package implementation. - puts "Updating item : #{options['updateItem']}" + + if ( ARGV[1].length > 0 || ARGV[1] == "tree" || ARGV[1].downcase == "abtlinux" ) + if ARGV[1].downcase == "tree" || ARGV[1].downcase == "abtlinux" + options['updateItem'] = "AbTLinux" + + puts "Start updating package tree : #{options['updateItem']}." + logger.info "Start updating package tree : #{options['updateItem']}." + + if downloader.update_package_tree( options['updateItem'] ) + puts "Updated package tree : #{options['updateItem']}." + else + puts "Unable to update package tree : #{options['updateItem']}." + logger.error "Unable to update package tree : #{options['updateItem']}." + logger.info( "Finished updating package tree : #{options['updateItem']}.") + exit + end + + logger.info( "Finished updating package tree : #{options['updateItem']}.") + + else + # assuming package to be updated. + options['updateItem'] = ARGV[1].downcase + + puts "Start updating package : #{options['updateItem']}." + logger.info "Start updating package : #{options['updateItem']}." + + if downloader.update_package( options['updateItem'] ) + puts "Updated package : #{options['updateItem']}." + else + puts "Unable to update package : #{options['updateItem']}." + logger.error "Unable to update package : #{options['updateItem']}." + logger.info( "Finished updating package : #{options['updateItem']}") + exit + end + + logger.info( "Finished updating package : #{options['updateItem']}") + end + else + show.usage( "downloads" ) + exit + end else - show.usage( "downloads" ) - exit + show.usage( "downloads" ) + exit end when "purge-src" @@ -530,7 +568,7 @@ case ARGV.length - # add, remove or update called. + # add or remove called. when 3 options['repoAction'] = ARGV[1] options['repoUri'] = ARGV[2] @@ -541,7 +579,7 @@ if ( ARGV[1] == "list" ) options['repoAction'] = ARGV[1] logger.info "TODO: Listing package repositories." - elsif ARGV[1] == "add" || ARGV[1] == "remove" || ARGV[1] == "update" + elsif ARGV[1] == "add" || ARGV[1] == "remove" # add, remove or update default repo. options['repoAction'] = ARGV[1] options['repoUri'] = "" @@ -582,26 +620,8 @@ exit end end - - when "update" - if options['repoUri'].length >= 0 - puts "Updating package repository : " + options['repoUri'] - if downloader.update_package_tree( options['repoUri'] ) - puts "Updated package tree : #{options['repoUri']}." - else - puts "Unable to update package tree : #{options['repoUri']}." - logger.error "Unable to update package tree : #{options['repoUri']}." - logger.info( "Finished package-repo : #{options['repoAction']}.") - exit - end - else - puts "Unable to update package tree : Default AbTLinux Package Tree." - logger.error "Unable to update package tree : Default AbTLinux Package Tree." - logger.info( "Finished package-repo : #{options['repoAction']}.") - exit - end - - when "remove" + + when "remove" # FIXME: implement this. if options['repoUri'].length > 0 puts "Removing package repository : " + options['repoUri'] Modified: src/trunk/abtdownloadmanager.rb =================================================================== --- src/trunk/abtdownloadmanager.rb 2007-09-25 20:40:23 UTC (rev 434) +++ src/trunk/abtdownloadmanager.rb 2007-09-25 20:41:52 UTC (rev 435) @@ -173,12 +173,38 @@ # <b>RETURN</b> <i>boolean</i> - True if the given package has been updated, # otherwise false. ## - def update_package + def update_package( packageName ) + logger = Logger.new($JOURNAL) + + # check if package exists in tree. + if File.exists?( "#{$PACKAGE_PATH}/#{packageName}.rb" ) + # check if svn directory. + if File.directory?( "#{$PACKAGE_PATH}.svn" ) + if system( "svn update #{$PACKAGE_PATH}/#{packageName.downcase}.rb" ) + logger.info "Package #{packageName.downcase} updated (svn update)" + else + logger.error "Package #{packageName.downcase} unable to update (svn update)." + return false + end + else + # package exists, but not an valid tree. + logger.error "Package #{packageName} exists, but not valid package tree (svn)." + return false + end + else + # package does not exist. + logger.error "Package is not installed, not possible to update!" + return false + end + + return true end ## # Updates the package tree. # + # <b>PARAM</b> <i>String</i> - the name of the tree to be updated, defaults to AbTLinux repo. + # # <b>RETURN</b> <i>boolean</i> - True if the package tree has been updated, # otherwise false. ## @@ -200,12 +226,10 @@ logger.error "Package tree exists, but is not valid svn tree." return false end - else - - # pacakge directory does not exist, svn co. - logger.error "Package tree not installed (svn co), problems!" - return false + # package directory does not exist. + logger.error "Package tree not installed!" + return false end return true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-09-25 20:40:27
|
Revision: 434 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=434&view=rev Author: eschabell Date: 2007-09-25 13:40:23 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Just a comment cleanup. Modified Paths: -------------- src/trunk/abtlogmanager.rb Modified: src/trunk/abtlogmanager.rb =================================================================== --- src/trunk/abtlogmanager.rb 2007-09-25 20:39:55 UTC (rev 433) +++ src/trunk/abtlogmanager.rb 2007-09-25 20:40:23 UTC (rev 434) @@ -100,9 +100,6 @@ # otherwise false. ## def log_package_integrity( package ) - #require "#{$PACKAGE_PATH}#{package}" - #sw = eval( "#{package.capitalize}.new" ) - #details = sw.details # our log locations. installLog = get_log( package, 'install' ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-09-25 20:39:51
|
Revision: 433 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=433&view=rev Author: eschabell Date: 2007-09-25 13:39:55 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Updated unit test to call our test package ipc. Modified Paths: -------------- src/trunk/testabtdownloadmanager.rb Modified: src/trunk/testabtdownloadmanager.rb =================================================================== --- src/trunk/testabtdownloadmanager.rb 2007-09-25 20:39:18 UTC (rev 432) +++ src/trunk/testabtdownloadmanager.rb 2007-09-25 20:39:55 UTC (rev 433) @@ -73,7 +73,7 @@ # Test method for 'AbtDownloadManager.test_update_package()' ## def test_update_package() - assert( @download.update_package() , "test_update_package()" ) + assert( @download.update_package( "ipc") , "test_update_package()" ) end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-09-25 20:39:15
|
Revision: 432 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=432&view=rev Author: eschabell Date: 2007-09-25 13:39:18 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Removed double entry, update should not be here. Modified Paths: -------------- src/trunk/abtusage.rb Modified: src/trunk/abtusage.rb =================================================================== --- src/trunk/abtusage.rb 2007-09-25 19:38:31 UTC (rev 431) +++ src/trunk/abtusage.rb 2007-09-25 20:39:18 UTC (rev 432) @@ -152,10 +152,9 @@ def usage_maintenance puts "\nmaintenance:" puts " build-location [host]\t\tSets global location (default: localhost) for retrieving cached package builds." - puts " package-repo [add|remove|update|list] [URI]" + puts " package-repo [add|remove|list] [URI]" puts " add - add package repository." puts " remove - remove a package repository." - puts " update - update a package repository." puts " list - display current repository listing.\n" end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-09-25 19:38:28
|
Revision: 431 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=431&view=rev Author: eschabell Date: 2007-09-25 12:38:31 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Update package tree implemented. Adjusted retrieve package tree functionality to no longer update. 15 unit tests to go! Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtdownloadmanager.rb src/trunk/abtusage.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-09-18 20:23:12 UTC (rev 430) +++ src/trunk/abt.rb 2007-09-25 19:38:31 UTC (rev 431) @@ -530,7 +530,7 @@ case ARGV.length - # add or remove called. + # add, remove or update called. when 3 options['repoAction'] = ARGV[1] options['repoUri'] = ARGV[2] @@ -541,11 +541,10 @@ if ( ARGV[1] == "list" ) options['repoAction'] = ARGV[1] logger.info "TODO: Listing package repositories." - elsif ARGV[1] == "add" || ARGV[1] == "remove" - # add or remove default repo. + elsif ARGV[1] == "add" || ARGV[1] == "remove" || ARGV[1] == "update" + # add, remove or update default repo. options['repoAction'] = ARGV[1] options['repoUri'] = "" - logger.info "Default AbTLinux Package Repository : #{options['repoAction']}." else show.usage( "maintenance" ) exit @@ -569,18 +568,39 @@ else puts "Unable to add package tree : #{options['repoUri']}." logger.error "Unable to add package tree : #{options['repoUri']}." + logger.info( "Finished package-repo : #{options['repoAction']}.") exit end else puts "Adding package repository : Default AbTLinux Package Tree" if downloader.retrieve_package_tree - puts "Added package tree : Default AbTLinux Package Tree}." + puts "Added package tree : Default AbTLinux Package Tree." else puts "Unable to add package tree : Default AbTLinux Package Tree." logger.error "Unable to add package tree : Default AbTLinux Package Tree." + logger.info( "Finished package-repo : #{options['repoAction']}.") exit end end + + when "update" + if options['repoUri'].length >= 0 + puts "Updating package repository : " + options['repoUri'] + if downloader.update_package_tree( options['repoUri'] ) + puts "Updated package tree : #{options['repoUri']}." + else + puts "Unable to update package tree : #{options['repoUri']}." + logger.error "Unable to update package tree : #{options['repoUri']}." + logger.info( "Finished package-repo : #{options['repoAction']}.") + exit + end + else + puts "Unable to update package tree : Default AbTLinux Package Tree." + logger.error "Unable to update package tree : Default AbTLinux Package Tree." + logger.info( "Finished package-repo : #{options['repoAction']}.") + exit + end + when "remove" # FIXME: implement this. if options['repoUri'].length > 0 @@ -598,7 +618,7 @@ exit end # case repoAction. - logger.info( "Starting package-repo : #{ARGV[1]} - #{ARGV[2]}.") + logger.info( "Finished package-repo : #{options['repoAction']}.") else show.usage( "all" ) Modified: src/trunk/abtdownloadmanager.rb =================================================================== --- src/trunk/abtdownloadmanager.rb 2007-09-18 20:23:12 UTC (rev 430) +++ src/trunk/abtdownloadmanager.rb 2007-09-25 19:38:31 UTC (rev 431) @@ -87,12 +87,8 @@ if File.directory?( $PACKAGE_PATH ) # check if svn directory. if File.directory?( "#{$PACKAGE_PATH}.svn" ) - if system( "svn update #{$PACKAGE_PATH}" ) - logger.info "Package tree updated (svn update)" - else - logger.error "Package tree unable to update (svn update)." - return false - end + logger.info "Package tree #{packageTreeName} already installed." + return true else # package directory exists, but is not a valid tree. logger.error "Package tree exists, but is not valid svn tree." @@ -186,7 +182,33 @@ # <b>RETURN</b> <i>boolean</i> - True if the package tree has been updated, # otherwise false. ## - def update_package_tree + def update_package_tree( packageTreeName="AbTLinux" ) + logger = Logger.new($JOURNAL) + + # check if package tree exists. + if File.directory?( $PACKAGE_PATH ) + # check if svn directory. + if File.directory?( "#{$PACKAGE_PATH}.svn" ) + if system( "svn update #{$PACKAGE_PATH}" ) + logger.info "Package tree updated (svn update)" + else + logger.error "Package tree unable to update (svn update)." + return false + end + else + # package directory exists, but is not a valid tree. + logger.error "Package tree exists, but is not valid svn tree." + return false + end + + else + + # pacakge directory does not exist, svn co. + logger.error "Package tree not installed (svn co), problems!" + return false + end + + return true end ## Modified: src/trunk/abtusage.rb =================================================================== --- src/trunk/abtusage.rb 2007-09-18 20:23:12 UTC (rev 430) +++ src/trunk/abtusage.rb 2007-09-25 19:38:31 UTC (rev 431) @@ -152,9 +152,10 @@ def usage_maintenance puts "\nmaintenance:" puts " build-location [host]\t\tSets global location (default: localhost) for retrieving cached package builds." - puts " package-repo [add|remove|list] [URI]" - puts " add - add package repository to list." - puts " remove - remove a package repository from list." - puts " list - display current repository list.\n" + puts " package-repo [add|remove|update|list] [URI]" + puts " add - add package repository." + puts " remove - remove a package repository." + puts " update - update a package repository." + puts " list - display current repository listing.\n" end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: ABout T. L. <esc...@us...> - 2007-09-25 18:48:02
|
IzExOiBkZWZpbmUgcGFja2FnZSBmb3JtYXQgYW5kIG1ldGhvZHMuDQotLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tDQogIFJlcG9ydGVyOiAgbG93ICAgICAgICB8ICAgICAgIE93bmVyOiAgbG93ICAgICAgICAg ICAgICAgICAgICAgICAgDQogICAgICBUeXBlOiAgd2lzaGxpc3QgICB8ICAgICAgU3RhdHVzOiAg Y2xvc2VkICAgICAgICAgICAgICAgICAgICAgDQogIFByaW9yaXR5OiAgY3JpdGljYWwgICB8ICAg TWlsZXN0b25lOiAgdmVyc2lvbl8wLjkgICAgICAgICAgICAgICAgDQogQ29tcG9uZW50OiAgZGVw RW5naW5lICB8ICAgICBWZXJzaW9uOiAgMC44ICAgICAgICAgICAgICAgICAgICAgICAgDQpSZXNv bHV0aW9uOiAgZml4ZWQgICAgICB8ICAgIEtleXdvcmRzOiAgcGFja2FnZSBmaWxlIGZvcm1hdCBt ZXRob2RzDQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpDaGFuZ2VzIChieSBlcmljcyk6DQoNCiAgKiBz dGF0dXM6ICBuZXcgPT4gY2xvc2VkDQogICogcmVzb2x1dGlvbjogID0+IGZpeGVkDQoNCkNvbW1l bnQ6DQoNCiBQcmV0dHkgbXVjaCBmaW5pc2hlZCBhcyBmYXIgYXMgSSBjYW4gdGVsbCwgbG9zdCBt b3N0IG9mIGl0IG9uIHRoZSB3aWtpDQogbW92ZSAoZm9ybWF0dGluZyBJIG1lYW4pLiBTZWUgYXBp IGNvZGViYXNlIGZvciB0aGUgYWN0dWFsbCBwYWNrYWdlIGZvcm1hdC4NCg0KIEkgd2lsbCBiZSBt b3ZpbmcgdG8gYSBwYWNrYWdlIGdlbmVyYXRpb24gdG9vbCBzb29uIGFueWhvdywgdGhpcyB3aWxs DQogY29udGFpbiB0aGUgcGFja2FnZSBmb3JtYXQvZGVzaWduLg0KDQotLSANClRpY2tldCBVUkw6 IDxodHRwOi8vdHJhYy5hYnRsaW51eC5vcmcvdGlja2V0LzExI2NvbW1lbnQ6Mj4NCkFCb3V0IFRp bWUgTGludXggPGh0dHA6Ly93d3cuYWJ0bGludXgub3JnPg0KSXQncyBhYm91dCB0aW1lIHNvbWVv bmUgZGlkIGl0IHJpZ2h0Li4u |
From: ABout T. L. <esc...@us...> - 2007-09-25 18:46:19
|
IzE1OiBSZWZhY3RvciB1c2Ugb2YgTG9nTWFuYWdlciBvdXQgb2YgY29kZSBiYXNlDQotLS0tLS0t LS0tLS0tLS0tLS0tLSstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tDQogIFJlcG9ydGVyOiAgZXJpY3MgIHwgICAgICAgT3duZXI6ICBlcmljcyAg ICAgIA0KICAgICAgVHlwZTogIHRhc2sgICB8ICAgICAgU3RhdHVzOiAgY2xvc2VkICAgICANCiAg UHJpb3JpdHk6ICBtYWpvciAgfCAgIE1pbGVzdG9uZTogIHZlcnNpb25fMC45DQogQ29tcG9uZW50 OiAgYWJ0ICAgIHwgICAgIFZlcnNpb246ICAwLjggICAgICAgIA0KUmVzb2x1dGlvbjogIGZpeGVk ICB8ICAgIEtleXdvcmRzOiAgICAgICAgICAgICANCi0tLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkNoYW5n ZXMgKGJ5IGVyaWNzKToNCg0KICAqIHN0YXR1czogIGFzc2lnbmVkID0+IGNsb3NlZA0KICAqIHJl c29sdXRpb246ICA9PiBmaXhlZA0KDQpDb21tZW50Og0KDQogVGhpcyBpcyBhY2NvbXBsaXNoZWQg YXMgZmFyIGFzIEkgd2FudCB0byB1c2UgdGhlIGludGVybmFsIGxvZ2dlciwgY2xvc2luZy4NCg0K LS0gDQpUaWNrZXQgVVJMOiA8aHR0cDovL3RyYWMuYWJ0bGludXgub3JnL3RpY2tldC8xNSNjb21t ZW50OjQ+DQpBQm91dCBUaW1lIExpbnV4IDxodHRwOi8vd3d3LmFidGxpbnV4Lm9yZz4NCkl0J3Mg YWJvdXQgdGltZSBzb21lb25lIGRpZCBpdCByaWdodC4uLg== |
From: ABout T. L. <esc...@us...> - 2007-09-25 18:45:45
|
IzEyOiBDb21wbGV0ZSBkZXNpZ24gZG9jdW1lbnQNCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAgUmVw b3J0ZXI6ICBlcmljcyAgICAgICAgICB8ICAgICAgIE93bmVyOiAgZXJpY3MgICAgICANCiAgICAg IFR5cGU6ICB0YXNrICAgICAgICAgICB8ICAgICAgU3RhdHVzOiAgY2xvc2VkICAgICANCiAgUHJp b3JpdHk6ICBtYWpvciAgICAgICAgICB8ICAgTWlsZXN0b25lOiAgdmVyc2lvbl8wLjkNCiBDb21w b25lbnQ6ICBhYnRsaW51eC1kb2NzICB8ICAgICBWZXJzaW9uOiAgMC44ICAgICAgICANClJlc29s dXRpb246ICBmaXhlZCAgICAgICAgICB8ICAgIEtleXdvcmRzOiAgICAgICAgICAgICANCi0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0NCkNoYW5nZXMgKGJ5IGVyaWNzKToNCg0KICAqIHN0YXR1czogIG5ldyA9 PiBjbG9zZWQNCiAgKiByZXNvbHV0aW9uOiAgPT4gZml4ZWQNCg0KQ29tbWVudDoNCg0KIEJ1bXBp bmcgdGhpcyBvbmUgb2ZmLCBpdCB3aWxsIHJlbWFpbiBhbiBvbmxpbmUgZG9jdW1lbnQsIG5vdCBn b2luZyB0bw0KIGxhdGV4IGFueW1vcmUhIDstKQ0KDQotLSANClRpY2tldCBVUkw6IDxodHRwOi8v dHJhYy5hYnRsaW51eC5vcmcvdGlja2V0LzEyI2NvbW1lbnQ6MT4NCkFCb3V0IFRpbWUgTGludXgg PGh0dHA6Ly93d3cuYWJ0bGludXgub3JnPg0KSXQncyBhYm91dCB0aW1lIHNvbWVvbmUgZGlkIGl0 IHJpZ2h0Li4u |