abtlinux-svn Mailing List for ABout Time Linux (AbTLinux)
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...> - 2008-12-14 21:24:52
|
Revision: 535 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=535&view=rev Author: eschabell Date: 2008-12-14 21:24:49 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtDownloadManager class to remove camelcased variables. Modified Paths: -------------- src/trunk/libs/abtdownloadmanager.rb Modified: src/trunk/libs/abtdownloadmanager.rb =================================================================== --- src/trunk/libs/abtdownloadmanager.rb 2008-12-14 21:19:44 UTC (rev 534) +++ src/trunk/libs/abtdownloadmanager.rb 2008-12-14 21:24:49 UTC (rev 535) @@ -53,23 +53,23 @@ # <b>RETURN</b> <i>boolean</i> - True if the package source has been # downloaded, otherwise false. ## - def retrieve_package_source(packageName, destination) - require "#{$PACKAGE_PATH}/#{packageName}" + def retrieve_package_source(package_name, destination) + require "#{$PACKAGE_PATH}/#{package_name}" logger = Logger.new($JOURNAL) - package = eval(packageName.capitalize + '.new') + package = eval(package_name.capitalize + '.new') - if (File.exist?("#{destination}/#{File.basename(package.srcUrl)}")) - logger.info("Download not needed, existing source found for #{packageName}.") + if (File.exist?(File.join(destination, File.basename(package.srcUrl)))) + logger.info("Download not needed, existing source found for #{package_name}.") return true end Dir.chdir(destination) if !system("wget #{package.srcUrl}") - logger.error("Download failed, unable to retrieve package #{packageName} sources, exit code was #{$?.exitstatus}.") + logger.error("Download failed, unable to retrieve package #{package_name} sources, exit code was #{$?.exitstatus}.") return false # download failed. end - logger.info("Download completed for #{packageName}") + logger.info("Download completed for #{package_name}") return true end @@ -81,14 +81,14 @@ # <b>RETURN</b> <i>boolean</i> - True if the package tree is retrieved, # otherwise false. ## - def retrieve_package_tree(packageTreeName="AbTLinux") + def retrieve_package_tree(package_tree_name="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") - logger.info "Package tree #{packageTreeName} already installed." + if File.directory?(File.join($PACKAGE_PATH, ".svn")) + logger.info "Package tree #{package_tree_name} already installed." return true else # package directory exists, but is not a valid tree. @@ -100,11 +100,11 @@ # pacakge directory does not exist, svn co. if !system("svn co #{$ABTLINUX_PACKAGES} #{$PACKAGE_PATH}") - logger.error "Package tree #{packageTreeName} not installed (svn co), exit status was #{$?.exitstatus}." + logger.error "Package tree #{package_tree_name} not installed (svn co), exit status was #{$?.exitstatus}." return false end - logger.info "Package tree #{packageTreeName} installed (svn co)." + logger.info "Package tree #{package_tree_name} installed (svn co)." end return true @@ -124,14 +124,14 @@ require 'uri' require 'rss/1.0' require 'rss/2.0' - newsLog = "" + news_log = "" logger = Logger.new($JOURNAL) # ensure we have our news logfile. if (cleanLog) - newsLog = File.new($ABTNEWS_LOG, "w+") + news_log = File.new($ABTNEWS_LOG, "w+") else - newsLog = File.new($ABTNEWS_LOG, "a+") + news_log = File.new($ABTNEWS_LOG, "a+") end # pick up the abtlinux.org news feed. @@ -151,16 +151,16 @@ logger.info("Failed to display news feed as feed #{uri} is not RSS 1.0/2.0.") return false else - newsLog << "*** #{rss.channel.title} ***\n" + news_log << "*** #{rss.channel.title} ***\n" rss.items.each_with_index do |item, itemCount| itemCount += 1 - newsLog << "#{itemCount} #{item.link} #{item.title}\n" + news_log << "#{itemCount} #{item.link} #{item.title}\n" end end - newsLog << "\n\n" - newsLog.close + news_log << "\n\n" + news_log.close return true end @@ -173,22 +173,22 @@ # <b>RETURN</b> <i>boolean</i> - True if the given package has been updated, # otherwise false. ## - def update_package(packageName) + def update_package(package_name) logger = Logger.new($JOURNAL) # check if package exists in tree. - if File.exists?("#{$PACKAGE_PATH}/#{packageName}.rb") + if File.exists?(File.join($PACKAGE_PATH, "#{package_name}.rb")) # check if svn directory. - if File.directory?("#{$PACKAGE_PATH}/.svn") - if !system("svn update #{$PACKAGE_PATH}/#{packageName.downcase}.rb") - logger.error "Package #{packageName.downcase} unable to update (svn update), exit status was #{$?.exitstatus}." + if File.directory?(File.join($PACKAGE_PATH, ".svn")) + if !system("svn update #{$PACKAGE_PATH}/#{package_name.downcase}.rb") + logger.error "Package #{package_name.downcase} unable to update (svn update), exit status was #{$?.exitstatus}." return false end - logger.info "Package #{packageName.downcase} updated (svn update)." + logger.info "Package #{package_name.downcase} updated (svn update)." else # package exists, but not an valid tree. - logger.error "Package #{packageName} exists, but not valid package tree (svn)." + logger.error "Package #{package_name} exists, but not valid package tree (svn)." return false end else @@ -212,7 +212,7 @@ # check if package tree exists. if File.directory?($PACKAGE_PATH) # check if svn directory. - if File.directory?("#{$PACKAGE_PATH}/.svn") + if File.directory?(File.join($PACKAGE_PATH, ".svn")) if !system("svn update #{$PACKAGE_PATH}") logger.error "Package tree unable to update (svn update), exit status was #{$?.exitstatus}." return false @@ -242,10 +242,10 @@ # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, # otherwise false. ## - def validated(hashvalue, path) + def validated(hash_value, path) logger = Logger.new($JOURNAL) - if hashvalue == Digest::SHA1.hexdigest(path) + if hash_value == Digest::SHA1.hexdigest(path) puts "Source hash validated successfully..." logger.info("Validated sources successfully...") return true @@ -253,7 +253,7 @@ puts "Source hash failed validation..." logger.error("Validating sources failed...") - logger.error(" expected: #{hashvalue}") + logger.error(" expected: #{hash_value}") logger.error(" computed: #{Digest::SHA1.hexdigest(path)}") return false end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-14 21:19:46
|
Revision: 534 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=534&view=rev Author: eschabell Date: 2008-12-14 21:19:44 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtLogManager class to remove camelcased variables. Modified Paths: -------------- src/trunk/libs/abtlogmanager.rb Modified: src/trunk/libs/abtlogmanager.rb =================================================================== --- src/trunk/libs/abtlogmanager.rb 2008-12-14 21:13:31 UTC (rev 533) +++ src/trunk/libs/abtlogmanager.rb 2008-12-14 21:19:44 UTC (rev 534) @@ -41,30 +41,30 @@ # # <b>RETURN</b> <i>void</i> ## - def check_for_file_renames(renames, installLog) + def check_for_file_renames(renames, install_log) # DEBUG: start check for renaming of files during installation. #renames.each_pair {|key, value| puts "#{key} is #{value}" } # cleanup install log renames. - installFile = open(installLog, 'r+') - lines = installFile.readlines - installFile.close + install_file = open(install_log, 'r+') + lines = install_file.readlines + install_file.close # check for changes due to renames. - #puts "DEBUG: [installlog] read in old install log..." - newInstall = File.new(installLog,'w') + #puts "DEBUG: [install_log] read in old install log..." + new_install = File.new(install_log,'w') lines.each do |line| changed = false # keep track of renamed lines. renames.each_pair do |old, new| if line.chomp == old.chomp #puts "DEBUG: [CHANGES] detected change at :#{line}" - newInstall.puts new + new_install.puts new changed = true end end - newInstall.puts line if !changed + new_install.puts line if !changed end end @@ -86,19 +86,19 @@ case type when 'install' - log = "#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.install" + log = File.join($PACKAGE_INSTALLED, details['Source location'], "#{details['Source location']}.install") when 'integrity' - log = "#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.integrity" + log = File.join($PACKAGE_INSTALLED, details['Source location'], "#{details['Source location']}.integrity") when 'tmpinstall' - log = "#{$ABT_TMP}/#{details['Source location']}.watch" + log = File.join($ABT_TMP, "#{details['Source location']}.watch") when 'build' - log = "#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.build" + log = File.join($PACKAGE_INSTALLED, details['Source location'], "#{details['Source location']}.build") when 'configure' - log = "#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.configure" + log = File.join($PACKAGE_INSTALLED, details['Source location'], "#{details['Source location']}.configure") else log = "" @@ -146,28 +146,28 @@ logger = Logger.new($JOURNAL) # our log locations. - installLog = get_log(package, 'install') - integrityLog = get_log(package, 'integrity') + install_log = get_log(package, 'install') + integrity_log = get_log(package, 'integrity') # get the installed files from the tmp file # into our install log. - if (File.exist?(installLog)) - installFile = open(installLog, 'r') - integrityFile = open(integrityLog, 'w') + if (File.exist?(install_log)) + install_file = open(install_log, 'r') + integrity_file = open(integrity_log, 'w') # get the integrity for each file, initially just permissions. - IO.foreach(installLog) do |line| + IO.foreach(install_log) do |line| if File.exist?(line.chomp) status = File.stat(line.chomp) octal = sprintf("%o", status.mode) - integrityFile << "#{line.chomp}:#{octal}\n" + integrity_file << "#{line.chomp}:#{octal}\n" else logger.info("[log_package_integrity] - #{line} is not installed, no worries, I will take care of everything...") end end - installFile.close - integrityFile.close + install_file.close + integrity_file.close else return false # no install log! end @@ -192,17 +192,17 @@ excluded_pattern = Regexp.new("^(/dev|/proc|/tmp|/var/tmp|/usr/src|/sys|#{$DEFAULT_PREFIX}/usr/src)+") # our log locations. - installLog = get_log(package, 'install') - tmpInstallLog = get_log(package, 'tmpinstall') + install_log = get_log(package, 'install') + tmpinstall_log = get_log(package, 'tmpinstall') # get the installed files from the tmp file # into our install log. - if (File.exist?(tmpInstallLog)) - installFile = open(installLog, 'w') + if (File.exist?(tmpinstall_log)) + install_file = open(install_log, 'w') # include only the file names from open calls # and not part of the excluded range of directories. - IO.foreach(tmpInstallLog) do |line| + IO.foreach(tmpinstall_log) do |line| if (line.split[1] == 'rename') # they renamed the line, save this entry for cleaning # after install log is closed. Hash key is the original @@ -216,13 +216,13 @@ if !duplicates.key?(line.split[2]) # add to duplicate tracking hash and install log. duplicates[line.split[2]] = line.split[2] - installFile << "#{line.split[2]}\n" + install_file << "#{line.split[2]}\n" end end end end - check_for_file_renames(renames, installLog) if !renames.empty? + check_for_file_renames(renames, install_log) if !renames.empty? else # no tmp install file, thus no install running. return false @@ -241,10 +241,10 @@ # otherwise false. ## def log_package_build(package) - buildLog = get_log(package, 'build') + build_log = get_log(package, 'build') # make sure the build file exists. - if (!File.exist?(buildLog)) + if (!File.exist?(build_log)) return false end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-14 21:13:32
|
Revision: 533 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=533&view=rev Author: eschabell Date: 2008-12-14 21:13:31 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtPackage class to remove camelcased variables. Modified Paths: -------------- src/trunk/libs/abtpackage.rb Modified: src/trunk/libs/abtpackage.rb =================================================================== --- src/trunk/libs/abtpackage.rb 2008-12-14 21:05:49 UTC (rev 532) +++ src/trunk/libs/abtpackage.rb 2008-12-14 21:13:31 UTC (rev 533) @@ -38,12 +38,12 @@ # otherwise false. ## def unpack_sources - srcFile = File.basename(@srcUrl) - sourcesToUnpack = "#{$SOURCES_REPOSITORY}/#{srcFile}" - unpackTool = "" + src_file = File.basename(@srcUrl) + sources_to_unpack = File.join($SOURCES_REPOSITORY, src_file) + unpack_tool = "" # check for existing file in source repo. - if (!File.exist?(sourcesToUnpack)) + if (!File.exist?(sources_to_unpack)) return false end @@ -53,24 +53,24 @@ end # determine which supported compression used [gz, tar, tgz, bz2, zip]. - compressionType = srcFile.split('.') + compression_type = src_file.split('.') - case compressionType.last + case compression_type.last when "gz" - unpackTool = "tar xzvf" + unpack_tool = "tar xzvf" when "tar" - unpackTool = "tar xvf" + unpack_tool = "tar xvf" when "bz2" - unpackTool = "tar xjvf" + unpack_tool = "tar xjvf" when "tgz" - unpackTool = "tar xzvf" + unpack_tool = "tar xzvf" when "zip" - unpackTool = "unizp" + unpack_tool = "unizp" else # unsupported format. @@ -78,7 +78,7 @@ end Dir.chdir($BUILD_LOCATION) - output = `#{unpackTool} #{sourcesToUnpack}` + output = `#{unpack_tool} #{sources_to_unpack}` exitcode = $?.exitstatus if (exitcode != 0) return false @@ -211,7 +211,7 @@ end # validate sources sha1. - if (!downloader.validated(@hashCheck, "#{$SOURCES_REPOSITORY}/#{File.basename(@srcUrl)}")) + if (!downloader.validated(@hashCheck, File.join($SOURCES_REPOSITORY, File.basename(@srcUrl)))) return false end @@ -221,8 +221,8 @@ end # ensure we have an installed directory to use. - if (! File.directory?("#{$PACKAGE_INSTALLED}/#{@srcDir}")) - FileUtils.mkdir_p("#{$PACKAGE_INSTALLED}/#{@srcDir}") + if (! File.directory?(File.join($PACKAGE_INSTALLED, @srcDir))) + FileUtils.mkdir_p(File.join($PACKAGE_INSTALLED, @srcDir)) end # TODO: implement pre section retrieve patches? @@ -263,7 +263,7 @@ puts "DEBUG not verbose: #{command}" end - Dir.chdir("#{$BUILD_LOCATION}/#{@srcDir}") + Dir.chdir(File.join($BUILD_LOCATION, @srcDir)) # set our optimizations before configuring. $cflags = "CFLAGS=" + '"' + $BUILD_CFLAGS + '"' @@ -313,7 +313,7 @@ end - Dir.chdir("#{$BUILD_LOCATION}/#{@srcDir}") + Dir.chdir(File.join($BUILD_LOCATION, @srcDir)) if !system(cmd) puts "[AbtPackage.build] - build section failed, exit code was #{$?.exitstatus}." @@ -361,7 +361,7 @@ "--logfile=#{$ABT_TMP}/#{@srcDir}.watch make install >/dev/null" end - Dir.chdir("#{$BUILD_LOCATION}/#{@srcDir}") + Dir.chdir(File.join($BUILD_LOCATION, @srcDir)) if !system(command) puts "[AbtPackage.install] - install section failed, exit code was #{$?.exitstatus}." @@ -407,13 +407,13 @@ def remove_build puts "Removings build..." if ($REMOVE_BUILD_SOURCES) - buildSourcesLocation = "#{$BUILD_LOCATION}/#{srcDir}" + build_sources_location = File.join($BUILD_LOCATION, srcDir) - if (!File.directory?(buildSourcesLocation)) + if (!File.directory?(build_sources_location)) return true end - if (!FileUtils.rm_rf buildSourcesLocation, :verbose => true ) + if (!FileUtils.rm_rf build_sources_location, :verbose => true ) 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...> - 2008-12-14 21:05:53
|
Revision: 532 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=532&view=rev Author: eschabell Date: 2008-12-14 21:05:49 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtPackageManager class to remove camelcased variables. Modified Paths: -------------- src/trunk/libs/abtpackagemanager.rb Modified: src/trunk/libs/abtpackagemanager.rb =================================================================== --- src/trunk/libs/abtpackagemanager.rb 2008-12-14 20:51:29 UTC (rev 531) +++ src/trunk/libs/abtpackagemanager.rb 2008-12-14 21:05:49 UTC (rev 532) @@ -43,13 +43,13 @@ # false. ## def roll_back(type, details) - logFile = "#{$PACKAGE_INSTALLED}/#{details['Source location']}/" + log_file = File.join($PACKAGE_INSTALLED, details['Source location']) case type when "install" - logFile = logFile + "#{details['Source location']}.install" + log_file = log_file + "#{details['Source location']}.install" - file = File.new(logFile, "r") + file = File.new(log_file, "r") while (line = file.gets) if (File.file?(line.chomp)) File.delete(line.chomp) @@ -58,7 +58,7 @@ file.close # cleanup install log as it is incomplete. - File.delete(logFile) + File.delete(log_file) else return false end @@ -95,8 +95,8 @@ logger = Logger.new($JOURNAL) system = AbtSystemManager.new - # TODO: refactor myLogger: - myLogger = AbtLogManager.new + # TODO: refactor my_logger: + my_logger = AbtLogManager.new # get package details. details = sw.details @@ -146,7 +146,7 @@ logger.info("Failed to process build section in the package description of #{package}.") return false else - if (!myLogger.log_package_build(sw.name.downcase)) + if (!my_logger.log_package_build(sw.name.downcase)) logger.info("Failed to create a package build log.") return false end @@ -169,13 +169,13 @@ if (!sw.install) # rollback installed files if any and remove install log. logger.info("Failed to process install section in the package description of #{package}.") - myLogger.log_package_install(sw.name.downcase) + my_logger.log_package_install(sw.name.downcase) logger.info("***Starting rollback of #{package} install and removing install log.") roll_back("install", details) return false else - myLogger.log_package_install(sw.name.downcase) - myLogger.log_package_integrity(sw.name.downcase) + my_logger.log_package_install(sw.name.downcase) + my_logger.log_package_integrity(sw.name.downcase) # cleanup tmp files from installwatch. File.delete("#{$ABT_TMP}/#{details['Source location']}.watch") @@ -285,8 +285,8 @@ def remove_package(package) require "#{$PACKAGE_PATH}/#{package}" sw = eval("#{package.capitalize}.new") - # TODO: refactor myLogger. - myLogger = AbtLogManager.new + # TODO: refactor my_logger. + my_logger = AbtLogManager.new logger = Logger.new($JOURNAL) system = AbtSystemManager.new @@ -303,12 +303,12 @@ # TODO: something with possible /etc or other configure files before removal, check maybe integrity for changes since install? # remove listings in install log. - installLog = myLogger.get_log(package, 'install') + install_log = my_logger.get_log(package, 'install') # only process install log if it exists, continue on with # journal log warning. - if File.exist?(installLog) - IO.foreach(installLog) do |line| + if File.exist?(install_log) + IO.foreach(install_log) do |line| if File.exist?(line.chomp) FileUtils.rm(line.chomp) logger.info("Removed file #{line.chomp} from #{package} install log.") @@ -318,7 +318,7 @@ end end - logger.info("Removed files from #{File.basename(installLog)} for #{package}.") + logger.info("Removed files from #{File.basename(install_log)} for #{package}.") else puts "Install log missing for #{package}, see journal..." logger.info("Install log was missing for #{package}...") @@ -327,7 +327,7 @@ # remove entry in install listing. - FileUtils.remove_dir("#{$PACKAGE_INSTALLED}/#{details['Source location']}") + FileUtils.remove_dir(File.join($PACKAGE_INSTALLED, details['Source location'])) logger.info("Removed entry from installed packages.") return true end @@ -377,12 +377,12 @@ # package already frozen, need to un-freeze by removing frozen.log # file. - FileUtils.rm "#{$PACKAGE_INSTALLED}/#{sw.srcDir}/frozen.log" + FileUtils.rm(File.join($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 = File.open(File.join($PACKAGE_INSTALLED, sw.srcDir, "frozen.log"), "w") frozen.puts "#{$TIMESTAMP}" frozen.close logger.info("Package #{package} is now frozen.") @@ -431,65 +431,65 @@ logger = AbtLogManager.new if (system.package_installed(package)) - sw = eval("#{package.capitalize}.new") - cachedDir = "#{$PACKAGE_CACHED}/#{sw.srcDir}" - sourcePath = "#{$SOURCES_REPOSITORY}/#{File.basename(sw.srcUrl)}" - sourceFile = File.basename(sw.srcUrl) - installLog = logger.get_log(package, 'install') - buildLog = logger.get_log(package, 'build') - configureLog = logger.get_log(package, 'configure') - integrityLog = logger.get_log(package, 'integrity') - packageFile = "#{$PACKAGE_PATH}/#{package}.rb" + sw = eval("#{package.capitalize}.new") + cached_dir = File.join($PACKAGE_CACHED, sw.srcDir) + source_path = File.join($SOURCES_REPOSITORY, File.basename(sw.srcUrl)) + source_file = File.basename(sw.srcUrl) + install_log = logger.get_log(package, 'install') + build_log = logger.get_log(package, 'build') + configure_log = logger.get_log(package, 'configure') + integrity_log = logger.get_log(package, 'integrity') + package_file = File.join($PACKAGE_PATH, "#{package}.rb") - FileUtils.mkdir_p(cachedDir) + FileUtils.mkdir_p(cached_dir) # collect package source. - if (FileTest::exist?(sourcePath)) - FileUtils.copy_file(sourcePath, "#{cachedDir}/#{sourceFile}") + if (FileTest::exist?(source_path)) + FileUtils.copy_file(source_path, File.join(cached_dir, source_file)) puts "\nCaching copy of #{package} source." else puts "\nUnable to cache copy of #{package} source." end # collect package install log. - if (FileTest::exist?(installLog)) - FileUtils.copy_file(installLog, "#{cachedDir}/#{sw.srcDir}.install") + if (FileTest::exist?(install_log)) + FileUtils.copy_file(install_log, File.join(cached_dir, "#{sw.srcDir}.install")) puts "\nCaching copy of #{package} install log." else puts "\nUnable to cache copy of #{package} install log." end # collect package build log. - if (FileTest::exist?(buildLog)) - FileUtils.copy_file(buildLog, "#{cachedDir}/#{sw.srcDir}.build") + if (FileTest::exist?(build_log)) + FileUtils.copy_file(build_log, File.join(cached_dir, "#{sw.srcDir}.build")) puts "\nCaching copy of #{package} build log." else puts "\nUnable to cache copy of #{package} build log." end # collect package configure log. - if (FileTest::exist?(configureLog)) - FileUtils.copy_file(configureLog, "#{cachedDir}/#{sw.srcDir}.configure") + if (FileTest::exist?(configure_log)) + FileUtils.copy_file(configure_log, File.join(cached_dir, "#{sw.srcDir}.configure")) puts "\nCaching copy of #{package} configure log." else puts "\nUnable to cache copy of #{package} configure log." end # collect package integrity log. - if (FileTest::exist?(integrityLog)) - FileUtils.copy_file(integrityLog, "#{cachedDir}/#{sw.srcDir}.integrity") + if (FileTest::exist?(integrity_log)) + FileUtils.copy_file(integrity_log, File.join(cached_dir, "#{sw.srcDir}.integrity")) puts "\nCaching copy of #{package} integrity log." else puts "\nUnable to cache copy of #{package} integrity log." end # collect package description (class file). - if (FileTest::exist?(packageFile)) - FileUtils.copy_file(packageFile, "#{cachedDir}/#{package}.rb") + if (FileTest::exist?(package_file)) + FileUtils.copy_file(package_file, File.join(cached_dir, "#{package}.rb")) puts "\nCaching copy of #{package} package description." else - puts "\nUnable to cache copy of #{package} package description, from location #{packageFile}" + puts "\nUnable to cache copy of #{package} package description, from location #{package_file}" end # tar and bzip this directory (package-cache-version.tar.bz2) @@ -497,7 +497,7 @@ if (system("tar -cf #{sw.srcDir}.tar #{sw.srcDir}") && system("bzip2 -f #{sw.srcDir}.tar")) # last but not least, remove our tarball directory - FileUtils.rm_rf(cachedDir) + FileUtils.rm_rf(cached_dir) return true end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-14 20:51:35
|
Revision: 531 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=531&view=rev Author: eschabell Date: 2008-12-14 20:51:29 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtQueueManager class to remove all camelcased variables. Modified Paths: -------------- src/trunk/libs/abtqueuemanager.rb Modified: src/trunk/libs/abtqueuemanager.rb =================================================================== --- src/trunk/libs/abtqueuemanager.rb 2008-12-14 19:38:31 UTC (rev 530) +++ src/trunk/libs/abtqueuemanager.rb 2008-12-14 20:51:29 UTC (rev 531) @@ -54,25 +54,22 @@ def action_package_queue(package, queue, action="add") require 'fileutils' logger = Logger.new($JOURNAL) - queueFile = "" # used to hold the queue location. + queue_file = "" # used to hold the queue location. # want to name install queue differently from log files. if (queue == 'install') - queueFile = "#{$ABT_LOGS}/#{queue}.queue" + queue_file = File.join($ABT_LOGS, "#{queue}.queue") else - queueFile = "#{$ABT_LOGS}/#{queue}.log" + queue_file = File.join($ABT_LOGS, "#{queue}.log") end if (action == "add") - if ( - log = File.new(queueFile, File::WRONLY|File::APPEND|File::CREAT, 0644)) + if (log = File.new(queue_file, File::WRONLY|File::APPEND|File::CREAT, 0644)) # pickup queue contents to ensure no duplicates. - checkingQueue = IO.readlines(queueFile) + checking_queue = IO.readlines(queue_file) # check if package exists, otherwise add. - if ( - !checkingQueue.collect{ |i| i.split('|')[0] }.include?( - package)) + if (!checking_queue.collect{ |i| i.split('|')[0] }.include?(package)) log.puts "#{package}|#{$TIMESTAMP}" logger.info("Added #{package} to #{queue} queue.") else @@ -87,27 +84,27 @@ if (action == "remove") # remove entry from given queue. if ( - log = File.new(queueFile, File::WRONLY|File::APPEND|File::CREAT, 0644)) + log = File.new(queue_file, File::WRONLY|File::APPEND|File::CREAT, 0644)) # use temp file to filter out entry to be removed. - temp = File.new(queueFile + ".tmp", "a+") + temp = File.new(queue_file + ".tmp", "a+") # now check for line to be removed. - IO.foreach(queueFile) do |line| - entryName = line.split('|')[0] - if (entryName != package.downcase) + IO.foreach(queue_file) do |line| + entry_name = line.split('|')[0] + if (entry_name != package.downcase) temp.puts line end end temp.close - FileUtils.mv(temp.path, queueFile) + FileUtils.mv(temp.path, queue_file) end log.close return true end - logger.info("Failed to open #{queueFile}.") + logger.info("Failed to open #{queue_file}.") 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...> - 2008-12-14 19:38:33
|
Revision: 530 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=530&view=rev Author: eschabell Date: 2008-12-14 19:38:31 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Refactored AbtReportManager class to remove all camelcased variables. Modified Paths: -------------- src/trunk/libs/abtreportmanager.rb Modified: src/trunk/libs/abtreportmanager.rb =================================================================== --- src/trunk/libs/abtreportmanager.rb 2008-12-14 10:26:37 UTC (rev 529) +++ src/trunk/libs/abtreportmanager.rb 2008-12-14 19:38:31 UTC (rev 530) @@ -148,14 +148,14 @@ # # <b>RETURN</b> <i>void.</i> ## - def show_package_log(package, logType) + def show_package_log(package, log_type) system = AbtSystemManager.new logger = AbtLogManager.new # just return if package log file type is not installed, up to # caller to message the user about why. - if File.exists?(logger.get_log(package, logType)) - File.open(logger.get_log(package, logType)).each { |line| puts line } + if File.exists?(logger.get_log(package, log_type)) + File.open(logger.get_log(package, log_type)).each { |line| puts line } end end @@ -168,7 +168,7 @@ def show_frozen_packages # determine if there are frozen pacakges. - frozenHash = Hash.new # has for values found. + frozen_hash = Hash.new # has for values found. if (Dir.entries($PACKAGE_INSTALLED) - [ '.', '..' ]).empty? return Hash.new # empty hash, no entries. @@ -177,17 +177,17 @@ if (package != "." && package != "..") # split the installed entry into two parts, # the package name and the version number. - #packageArray = package.split("-") - #packageName = packageArray[0] + #package_array = package.split("-") + #package_name = package_array[0] # check for frozen log file. - if (File.exist?("#{$PACKAGE_INSTALLED}/#{package}/frozen.log")) - # dump packgae + frozen.log timestamp in packageHash. + if (File.exist?(File.join($PACKAGE_INSTALLED, package, "frozen.log"))) + # dump packgae + frozen.log timestamp in package_hash. begin - file = File.new("#{$PACKAGE_INSTALLED}/#{package}/frozen.log", "r") + file = File.new(File.join($PACKAGE_INSTALLED, package, "frozen.log"), "r") #while (line = file.gets) line = file.gets - frozenHash = frozenHash.merge(Hash[ "#{package}" => "#{line}" ]) + frozen_hash = frozen_hash.merge(Hash[ "#{package}" => "#{line}" ]) #end file.close rescue => error @@ -199,7 +199,7 @@ } end - return frozenHash + return frozen_hash end ## @@ -260,17 +260,17 @@ # # <b>RETURN</b> <i>iboolean</i> True if journal shown, otherwise false. ## - def show_journal(fileName) - if (File.exist?(fileName)) + def show_journal(file_name) + if (File.exist?(file_name)) puts "\n\n" puts "AbTLinux log:" puts "=============" - log = IO.readlines(fileName) + log = IO.readlines(file_name) log.each{ |entry| puts entry } puts "\n\n" else puts "\n\n" - puts "AbtLinux log (#{File.basename(fileName)}) " + + puts "AbtLinux log (#{File.basename(file_name)}) " + "is empty at this time." puts "\n\n" end @@ -299,31 +299,31 @@ # <b>RETURN</b> <i>hash</i> - a hash of the search results, keys are package # names and values are matching descriptions. ## - def search_package_descriptions(searchText) - packageHash = Hash.new # has for values found. + def search_package_descriptions(search_text) + package_hash = Hash.new # has for values found. if (Dir.entries($PACKAGE_INSTALLED) - [ '.', '..' ]).empty? - return packageHash # empty hash, no entries. + return package_hash # 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] + package_array = package.split("-") + package_name = package_array[0] # check for match to name and description if the package file exists. - if (File.exist?("#{$PACKAGE_PATH}/#{packageName}.rb")) - require "#{$PACKAGE_PATH}/#{packageName}" - sw = eval("#{packageName.capitalize}.new") + if (File.exist?("#{$PACKAGE_PATH}/#{package_name}.rb")) + require "#{$PACKAGE_PATH}/#{package_name}" + sw = eval("#{package_name.capitalize}.new") # add if matches name or description entries. - matchesArray = sw.description.scan(searchText) - matchesArray = matchesArray.concat(packageName.scan(searchText)) + matches_array = sw.description.scan(search_text) + matches_array = matches_array.concat(package_name.scan(search_text)) - if matchesArray.length > 0 + if matches_array.length > 0 # matches description so add it to hash. - packageHash = packageHash.merge(Hash[ "#{package}" => "#{sw.description}" ]) + package_hash = package_hash.merge(Hash[ "#{package}" => "#{sw.description}" ]) end end end @@ -331,7 +331,7 @@ end # finished search results. - return packageHash + return package_hash end ## @@ -342,25 +342,25 @@ # # <b>RETURN</b> <i>void.</i> ## - def show_queue(queueType) + def show_queue(queue_type) - case queueType + case queue_type when "install" - if (File.exist?("#{$ABT_LOGS}/#{queueType}.queue")) + if (File.exist?(File.join($ABT_LOGS, "#{queue_type}.queue"))) puts "\n\n" - puts "AbTLinux #{queueType} queue:" + puts "AbTLinux #{queue_type} queue:" puts "=======================" - queue = IO.readlines("#{$ABT_LOGS}/#{queueType}.queue") + queue = IO.readlines(File.join($ABT_LOGS, "#{queue_type}.queue")) queue.each{ |entry| puts entry } puts "\n\n" else puts "\n\n" - puts "AbtLinux #{queueType} is empty at this time." + puts "AbtLinux #{queue_type} is empty at this time." puts "\n\n" end else - puts "#{queueType.capitalize} is not an AbTLinux queue." + puts "#{queue_type.capitalize} is not an AbTLinux queue." end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-14 10:26:41
|
Revision: 529 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=529&view=rev Author: eschabell Date: 2008-12-14 10:26:37 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Completed camelCase refactoring of AbtSystemManager class. Modified Paths: -------------- src/trunk/libs/abtsystemmanager.rb Modified: src/trunk/libs/abtsystemmanager.rb =================================================================== --- src/trunk/libs/abtsystemmanager.rb 2008-12-14 09:56:06 UTC (rev 528) +++ src/trunk/libs/abtsystemmanager.rb 2008-12-14 10:26:37 UTC (rev 529) @@ -80,7 +80,7 @@ ## def cleanup_package_sources(verbose=true) logger = Logger.new($JOURNAL) - sourcesArray = Array.new + sources_array = Array.new if (Dir.entries($PACKAGE_INSTALLED) - [ '.', '..' ]).empty? FileUtils.remove Dir.glob("#{$SOURCES_REPOSITORY}/*"), :verbose => verbose, :force => true @@ -91,14 +91,14 @@ if (package != "." && package != "..") # split the installed entry into two parts, # the package name and the version number. - packageArray = package.split("-") - packageName = packageArray[0] + package_array = package.split("-") + package_name = package_array[0] # create an array of installed package tarball names. - if (File.exist?("#{$PACKAGE_PATH}#{packageName}.rb")) - require "#{$PACKAGE_PATH}#{packageName}" - sw = eval("#{packageName.capitalize}.new") - sourcesArray.push(File.basename(sw.srcUrl)) + if (File.exist?("#{$PACKAGE_PATH}#{package_name}.rb")) + require "#{$PACKAGE_PATH}#{package_name}" + sw = eval("#{package_name.capitalize}.new") + sources_array.push(File.basename(sw.srcUrl)) end end } @@ -113,7 +113,7 @@ puts "====================================" end - Dir.foreach($SOURCES_REPOSITORY) { |file| FileUtils.remove("#{$SOURCES_REPOSITORY}/#{file}", :verbose => verbose, :force => true) if (file != "." && file != ".." && !sourcesArray.include?(file)) } + Dir.foreach($SOURCES_REPOSITORY) { |file| FileUtils.remove(File.join($SOURCES_REPOSITORY, file), :verbose => verbose, :force => true) if (file != "." && file != ".." && !sources_array.include?(file)) } if (verbose) puts "====================================\n" @@ -133,21 +133,21 @@ ## def verify_installed_files(package) logger = Logger.new($JOURNAL) - # TODO: refactor myLogger: - myLogger = AbtLogManager.new + # TODO: refactor my_logger: + my_logger = AbtLogManager.new if !package_installed(package) logger.info("Unable to verify installed files for #{package}, it's not installed!") return false end - if !File.exist?(myLogger.get_log(package, 'install')) + if !File.exist?(my_logger.get_log(package, 'install')) logger.info("Unable to verify installed files for #{package}, installed package but install log missing!") return false end failure = false # marker after checking all files to determine failure. - File.open(myLogger.get_log(package, "install")).each { |line| + File.open(my_logger.get_log(package, "install")).each { |line| if !File.exist?(line.chomp) logger.info("The file : #{line.chomp} is missing for #{package}.") failure = true @@ -199,28 +199,28 @@ require "#{$PACKAGE_PATH}/#{package}" sw = eval("#{package.capitalize}.new") - # TODO: refactor myLogger. - myLogger = AbtLogManager.new + # TODO: refactor my_logger. + my_logger = AbtLogManager.new logger = Logger.new($JOURNAL) - integrityHash = Hash.new # holds files failing interity check. + integrity_hash = Hash.new # holds files failing interity check. - if !File.exist?("#{$PACKAGE_INSTALLED}/#{sw.srcDir}/#{sw.srcDir}.integrity") + if !File.exist?(File.join($PACKAGE_INSTALLED, sw.srcDir, "#{sw.srcDir}.integrity")) logger.info("Unable to check file integrity for #{package}, integrity log missing!") - return integrityHash # empty hash, no entries. + return integrity_hash # empty hash, no entries. else # FIXME: pickup each integrity file and check each entry (filename integrityvalue) - File.open(myLogger.get_log(package, "integrity")).each { |line| + File.open(my_logger.get_log(package, "integrity")).each { |line| # seperate the filepath and integrity value. - lineArray = line.split(':') + line_array = line.split(':') # check for existing file. - if !File.exist?(lineArray[0].chomp) - logger.info("The file : #{lineArray[0].chomp} is missing for #{package}.") + if !File.exist?(line_array[0].chomp) + logger.info("The file : #{line_array[0].chomp} is missing for #{package}.") # any failure or discrepency is added to hash: file => package + problem - integrityHash = integrityHash.merge(Hash[ lineArray[0].chomp => "#{package} - file missing." ]) + integrity_hash = integrity_hash.merge(Hash[ line_array[0].chomp => "#{package} - file missing." ]) end # passed existence check, now integrity check, need to ensure @@ -228,16 +228,16 @@ # computing the results, converting to octal, then chop off the # first char by reversing the string and chopping the last (is # there a better way?) char and then reversing those results. - octalResults = '%07o' % File.lstat(lineArray[0].chomp).mode + octal_results = '%07o' % File.lstat(line_array[0].chomp).mode - if lineArray[1].chomp != octalResults.reverse.chop.reverse + if line_array[1].chomp != octal_results.reverse.chop.reverse # any failure or discrepency is added to hash: file => package + problem - integrityHash = integrityHash.merge(Hash[ file => "#{package} #{sw.description}" ]) + integrity_hash = integrity_hash.merge(Hash[ file => "#{package} #{sw.description}" ]) end } end - return integrityHash + return integrity_hash end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-14 09:56:10
|
Revision: 528 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=528&view=rev Author: eschabell Date: 2008-12-14 09:56:06 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Bit of refactoring started on abtsystemmanager. Modified Paths: -------------- src/trunk/libs/abtsystemmanager.rb Modified: src/trunk/libs/abtsystemmanager.rb =================================================================== --- src/trunk/libs/abtsystemmanager.rb 2008-12-13 18:54:18 UTC (rev 527) +++ src/trunk/libs/abtsystemmanager.rb 2008-12-14 09:56:06 UTC (rev 528) @@ -293,7 +293,7 @@ require "#{$PACKAGE_PATH}/#{package}" sw = eval("#{package.capitalize}.new") - if (found_entry("#{$PACKAGE_INSTALLED}/#{sw.srcDir}", "#{sw.srcDir}.install")) + if (found_entry(File.join($PACKAGE_INSTALLED, sw.srcDir), "#{sw.srcDir}.install")) return true end @@ -313,8 +313,8 @@ require "#{$PACKAGE_PATH}/#{package}" sw = eval("#{package.capitalize}.new") - # looking for frozen log file. - if (found_entry("#{$PACKAGE_INSTALLED}/#{sw.srcDir}", "frozen.log")) + # looking for frozen log file. + if (found_entry(File.join($PACKAGE_INSTALLED, sw.srcDir), "frozen.log")) return true end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-13 18:54:22
|
Revision: 527 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=527&view=rev Author: eschabell Date: 2008-12-13 18:54:18 +0000 (Sat, 13 Dec 2008) Log Message: ----------- Refactored abtconfig to use File.join for building paths. Modified Paths: -------------- src/trunk/abtconfig.rb Modified: src/trunk/abtconfig.rb =================================================================== --- src/trunk/abtconfig.rb 2008-12-04 07:42:59 UTC (rev 526) +++ src/trunk/abtconfig.rb 2008-12-13 18:54:18 UTC (rev 527) @@ -1,6 +1,5 @@ #!/usr/bin/ruby -w -$DEFAULT_PREFIX = "/usr/local" -$LOAD_PATH.unshift "#{$DEFAULT_PREFIX}/var/lib/abt/" + ## # abtconfig.rb # @@ -27,6 +26,18 @@ ## # global requires. +require 'fileutils' +require 'ftools' +require 'find' +require 'logger' +require 'digest/sha1' + +# need this path here first before loading our project requires. +$DEFAULT_PREFIX = "/usr/local" +$ABT_LIBS = File.join($DEFAULT_PREFIX, "var", "lib", "abt") +$LOAD_PATH.unshift $ABT_LIBS + +# project requires. require 'abtdownloadmanager' require 'abtlogmanager' require 'abtpackagemanager' @@ -37,26 +48,20 @@ require 'abtsystemmanager' require 'abtusage' -require 'fileutils' -require 'find' -require 'logger' -require 'digest/sha1' - # default paths / locations. -$ABT_LOGS = "#{$DEFAULT_PREFIX}/var/log/abt" -$ABT_CACHES = "#{$DEFAULT_PREFIX}/var/spool/abt" -$ABT_STATE = "#{$DEFAULT_PREFIX}/var/state/abt" +$ABT_LOGS = File.join($DEFAULT_PREFIX, "var", "log", "abt") +$ABT_CACHES = File.join($DEFAULT_PREFIX, "var", "spool", "abt") +$ABT_STATE = File.join($DEFAULT_PREFIX, "var", "state", "abt") $ABT_TMP = "/tmp/abt" -$ABT_CONFIG = "#{$DEFAULT_PREFIX}/etc/abt" -$ABT_LIBS = "#{$DEFAULT_PREFIX}/var/lib/abt" -$ABT_LOCAL_CONFIG = "#{$DEFAULT_PREFIX}/etc/abt/local" -$ABTNEWS_LOG = "#{$ABT_LOGS}/news.log" -$BUILD_LOCATION = "#{$DEFAULT_PREFIX}/usr/src" -$JOURNAL = "#{$ABT_LOGS}/journal.log" # use logger.info. -$PACKAGE_INSTALLED = "#{$ABT_STATE}/installed" -$PACKAGE_CACHED = "#{$ABT_STATE}/cached" -$PACKAGE_PATH = "#{$ABT_CACHES}/packages" -$SOURCES_REPOSITORY = "#{$ABT_CACHES}/sources" +$ABT_CONFIG = File.join($DEFAULT_PREFIX, "etc", "abt") +$ABT_LOCAL_CONFIG = File.join($DEFAULT_PREFIX, "etc", "abt", "local") +$ABTNEWS_LOG = File.join($ABT_LOGS, "news.log") +$BUILD_LOCATION = File.join($DEFAULT_PREFIX, "usr", "src") +$JOURNAL = File.join($ABT_LOGS, "journal.log") # use logger.info. +$PACKAGE_INSTALLED = File.join($ABT_STATE, "installed") +$PACKAGE_CACHED = File.join($ABT_STATE, "cached") +$PACKAGE_PATH = File.join($ABT_CACHES, "packages") +$SOURCES_REPOSITORY = File.join($ABT_CACHES, "sources") # default config options. @@ -67,11 +72,11 @@ $BUILD_NODEBUG = "-fomit-frame-pointer" # removes debug info. $BUILD_SPEEDY = "-pipe" # faster compile, pipes into next function instead of temp files. $BUILD_CFLAGS = "#{$BUILD_ARCH} #{$BUILD_SIZE} #{$BUILD_SPEEDY} #{$BUILD_NODEBUG}" # all our build options. -$BUILD_PREFIX = "#{$DEFAULT_PREFIX}/usr" -$BUILD_SYSCONFDIR = "#{$DEFAULT_PREFIX}/etc" -$BUILD_LOCALSTATEDIR = "#{$DEFAULT_PREFIX}/var" -$BUILD_MANDIR = "#{$DEFAULT_PREFIX}/usr/share/man" -$BUILD_INFODIR = "#{$DEFAULT_PREFIX}/usr/share/info" +$BUILD_PREFIX = File.join($DEFAULT_PREFIX, "usr") +$BUILD_SYSCONFDIR = File.join($DEFAULT_PREFIX, "etc") +$BUILD_LOCALSTATEDIR = File.join($DEFAULT_PREFIX, "var") +$BUILD_MANDIR = File.join($DEFAULT_PREFIX, "usr", "share", "man") +$BUILD_INFODIR = File.join($DEFAULT_PREFIX, "usr", "share", "info") $REMOVE_BUILD_SOURCES = true $TIMESTAMP = Time.now.strftime( "%Y-%m-%d %H:%M:%S (%Z)" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2008-12-04 07:43:01
|
Revision: 526 http://abtlinux.svn.sourceforge.net/abtlinux/?rev=526&view=rev Author: eschabell Date: 2008-12-04 07:42:59 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Putting project back into sourceforge... these are the changes since flirting with assembla.com: ------------------------------------------------------------------------ r582 | eschabell | 2008-10-15 22:05:15 +0200 (Wed, 15 Oct 2008) | 1 line Added new package unzip, not working but package is done. ------------------------------------------------------------------------ r581 | eschabell | 2008-10-15 22:04:38 +0200 (Wed, 15 Oct 2008) | 1 line Another fix to automate the hash generation in new packages. ------------------------------------------------------------------------ r580 | eschabell | 2008-10-15 21:50:59 +0200 (Wed, 15 Oct 2008) | 1 line Added new package gzip. ------------------------------------------------------------------------ r579 | eschabell | 2008-10-15 21:50:46 +0200 (Wed, 15 Oct 2008) | 1 line Update hash generation to work correctly I hope. ------------------------------------------------------------------------ r578 | eschabell | 2008-10-13 22:15:09 +0200 (Mon, 13 Oct 2008) | 1 line Updated glibc to version 2.7, build still needs work and is broken. ------------------------------------------------------------------------ r577 | eschabell | 2008-10-13 22:07:55 +0200 (Mon, 13 Oct 2008) | 1 line Updated and automated a bit more in the new package generation tool. ------------------------------------------------------------------------ r576 | eschabell | 2008-10-13 22:06:52 +0200 (Mon, 13 Oct 2008) | 1 line Gcc version bumped to 4.3.2, it builds so for now leaving older version (commented out) and has in the package file. ------------------------------------------------------------------------ r575 | eschabell | 2008-10-05 22:15:47 +0200 (Sun, 05 Oct 2008) | 1 line Cleanup of some packages and applied the configure shell passing fix for the packages overriding the main configure. ------------------------------------------------------------------------ r574 | eschabell | 2008-10-05 22:14:51 +0200 (Sun, 05 Oct 2008) | 1 line Fix to broken configure and builds using a shell command without delimter (%x), now it is passing the shell command as a shell command and not trying to expand it as a string with variables in the ruby interpreter. ------------------------------------------------------------------------ r573 | eschabell | 2008-10-05 21:16:23 +0200 (Sun, 05 Oct 2008) | 1 line Updated bash configure override to new method. ------------------------------------------------------------------------ r572 | eschabell | 2008-09-29 22:34:04 +0200 (Mon, 29 Sep 2008) | 1 line Created gcc package, is not yet compiling but it is a start on this monster ------------------------------------------------------------------------ r571 | eschabell | 2008-09-28 22:15:48 +0200 (Sun, 28 Sep 2008) | 1 line Fixed show-config to not depend on package being on the installed list, as failure of configure results in a log but not in an installed status. ------------------------------------------------------------------------ r570 | eschabell | 2008-09-28 22:15:02 +0200 (Sun, 28 Sep 2008) | 1 line Small fix to add missing docs for input parameter. ------------------------------------------------------------------------ r569 | eschabell | 2008-09-28 11:40:18 +0200 (Sun, 28 Sep 2008) | 1 line Found one error already, need to cleanup the basic make command to seperate concerns. ------------------------------------------------------------------------ r568 | eschabell | 2008-09-28 11:38:28 +0200 (Sun, 28 Sep 2008) | 1 line This should fix the problem with chaining piped commands and the missing exit codes on return. Untested as I am not on a Linux machine at the moment. ------------------------------------------------------------------------ r567 | eschabell | 2008-09-27 23:25:44 +0200 (Sat, 27 Sep 2008) | 1 line Partial fix to the configure section (still build section to fix), now able to track failures, but unacceptable wait to rerun configure to log the output on failure. So if all goes well, then no logging of configure right now, only on failure. So be it for now... ------------------------------------------------------------------------ r566 | eschabell | 2008-09-27 22:58:47 +0200 (Sat, 27 Sep 2008) | 1 line Removed usage of pipe through tee as system unable to detect failure of command chained through tee, tee is always exit code 0. ------------------------------------------------------------------------ r565 | eschabell | 2008-09-27 12:51:54 +0200 (Sat, 27 Sep 2008) | 1 line Added package less, there are depencencies on ncurses which does not build yet so this is also broken now. ------------------------------------------------------------------------ r564 | eschabell | 2008-09-27 12:22:06 +0200 (Sat, 27 Sep 2008) | 1 line Added bit more info as to failur in pre-section being related to downloading. ------------------------------------------------------------------------ r563 | eschabell | 2008-09-27 12:21:37 +0200 (Sat, 27 Sep 2008) | 1 line Fixed missing quotes and updated hash for gawk, package now working. ------------------------------------------------------------------------ r562 | eschabell | 2008-09-24 22:10:01 +0200 (Wed, 24 Sep 2008) | 1 line Added initial setup for gawk package, fails in pre-section so needs some override work I guess... ------------------------------------------------------------------------ r561 | eschabell | 2008-09-24 21:56:17 +0200 (Wed, 24 Sep 2008) | 1 line Updated last three packages that do not yet build, seems like dependency problems. ------------------------------------------------------------------------ r560 | eschabell | 2008-09-22 22:08:20 +0200 (Mon, 22 Sep 2008) | 1 line Added cpio package. ------------------------------------------------------------------------ r559 | eschabell | 2008-09-22 21:30:31 +0200 (Mon, 22 Sep 2008) | 1 line Added bzip2 package. ------------------------------------------------------------------------ r558 | eschabell | 2008-07-18 22:27:20 +0200 (Fri, 18 Jul 2008) | 1 line The rest of the api docs for the packages. ------------------------------------------------------------------------ r557 | eschabell | 2008-07-18 22:17:22 +0200 (Fri, 18 Jul 2008) | 1 line Updated api doc generation script to pick up the packages. Regnerated api docs. ------------------------------------------------------------------------ r556 | eschabell | 2008-07-18 22:10:27 +0200 (Fri, 18 Jul 2008) | 1 line Added two working packages (wget and tar), and one new with some errors (texinfo) thus todo marked. ------------------------------------------------------------------------ r555 | eschabell | 2008-06-05 22:13:52 +0200 (Thu, 05 Jun 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r554 | eschabell | 2008-06-05 22:09:32 +0200 (Thu, 05 Jun 2008) | 1 line Fixed removal of the time offset element in the show_installed_packages report. ------------------------------------------------------------------------ r553 | eschabell | 2008-06-04 22:19:10 +0200 (Wed, 04 Jun 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r552 | eschabell | 2008-06-04 22:03:24 +0200 (Wed, 04 Jun 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r551 | eschabell | 2008-06-04 22:02:19 +0200 (Wed, 04 Jun 2008) | 1 line Adjusted tabbing on longer package names. ------------------------------------------------------------------------ r550 | eschabell | 2008-06-04 21:49:54 +0200 (Wed, 04 Jun 2008) | 1 line Refactored display of show-installed to show package, version and neater installed timestamp. ------------------------------------------------------------------------ r549 | eschabell | 2008-06-01 22:50:24 +0200 (Sun, 01 Jun 2008) | 1 line Updated api docs. ------------------------------------------------------------------------ r548 | eschabell | 2008-06-01 22:49:20 +0200 (Sun, 01 Jun 2008) | 1 line Improved show-installed to display timestamp of installed packages, check for corrupted installed packages repo, and logged findings to journal. There is a new bug in the running of the search_descriptions in testabtreportmanager, but this is something to do with the test class setup and not the command itself, might be a ruby version bug not sure. Will look into it more later. ------------------------------------------------------------------------ r547 | eschabell | 2008-06-01 22:47:27 +0200 (Sun, 01 Jun 2008) | 1 line Grep description removed lines feeds. ------------------------------------------------------------------------ r545 | eschabell | 2008-05-22 16:34:24 +0200 (Thu, 22 May 2008) | 1 line Bumped version to v0.3. ------------------------------------------------------------------------ r544 | eschabell | 2008-05-22 16:32:37 +0200 (Thu, 22 May 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r543 | eschabell | 2008-05-22 16:09:10 +0200 (Thu, 22 May 2008) | 1 line Added packages 9 and 10, finishes task #17. ------------------------------------------------------------------------ r542 | eschabell | 2008-05-22 15:40:36 +0200 (Thu, 22 May 2008) | 1 line Refactored log_package_install to prevent double entries in logging. Refactored log_package_integrity to test for existing files on system before adding into log. ------------------------------------------------------------------------ r541 | eschabell | 2008-05-22 12:05:20 +0200 (Thu, 22 May 2008) | 1 line Commented out some debug. ------------------------------------------------------------------------ r540 | eschabell | 2008-05-22 12:04:15 +0200 (Thu, 22 May 2008) | 1 line Fixed problems with renaming of install files during build/installation. Binutils was doing this, my first encounter with renaming of files in install process. ------------------------------------------------------------------------ r539 | eschabell | 2008-05-20 22:07:40 +0200 (Tue, 20 May 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r538 | eschabell | 2008-05-20 22:03:48 +0200 (Tue, 20 May 2008) | 1 line Binutils needs to be tested on build machine yet, but think it is ready to go. Glibc is work in progress, marked with todo. ------------------------------------------------------------------------ r537 | eschabell | 2008-05-20 21:54:45 +0200 (Tue, 20 May 2008) | 1 line Clarified error and success reporting on ldconfig run. ------------------------------------------------------------------------ r536 | eschabell | 2008-05-20 18:31:17 +0200 (Tue, 20 May 2008) | 1 line Added ncurses package. ------------------------------------------------------------------------ r535 | eschabell | 2008-05-20 18:18:25 +0200 (Tue, 20 May 2008) | 1 line Added sed package and migrated gnu repo to http. ------------------------------------------------------------------------ r534 | eschabell | 2008-05-20 15:50:23 +0200 (Tue, 20 May 2008) | 1 line Removed exit strategy for missing checkinstall. ------------------------------------------------------------------------ r533 | eschabell | 2008-05-18 10:12:06 +0200 (Sun, 18 May 2008) | 3 lines Changed all references to sourceforge repo to the assembla (current) repo. Api docs regenerated. ------------------------------------------------------------------------ r532 | eschabell | 2008-05-14 22:19:06 +0200 (Wed, 14 May 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r531 | eschabell | 2008-05-14 22:15:25 +0200 (Wed, 14 May 2008) | 1 line Fix to override main configuration file with a myabtconfig.rb file. This fixes / implements ticket #16. ------------------------------------------------------------------------ r530 | eschabell | 2008-04-28 22:09:56 +0200 (Mon, 28 Apr 2008) | 1 line Regenerated api docs. ------------------------------------------------------------------------ r529 | eschabell | 2008-04-28 22:07:00 +0200 (Mon, 28 Apr 2008) | 1 line Some require cleanup and added two sections (commented out) that can be used on an initial setup machine to get the testsuite to make it through an initial run automagically. ------------------------------------------------------------------------ r528 | eschabell | 2008-04-28 22:05:32 +0200 (Mon, 28 Apr 2008) | 1 line Updated variable to point to correct svn repo, reflects new trac migration. ------------------------------------------------------------------------ r527 | eschabell | 2008-04-26 22:32:24 +0200 (Sat, 26 Apr 2008) | 1 line Regenerated docs as a test. ------------------------------------------------------------------------ r526 | eschabell | 2008-04-05 17:18:05 +0200 (Sat, 05 Apr 2008) | 1 line Update api docs. ------------------------------------------------------------------------ Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtconfig.rb 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/libs/abtdepengine_rb.html src/trunk/doc/files/libs/abtdownloadmanager_rb.html src/trunk/doc/files/libs/abtlogmanager_rb.html src/trunk/doc/files/libs/abtpackage_rb.html src/trunk/doc/files/libs/abtpackagemanager_rb.html src/trunk/doc/files/libs/abtqueuemanager_rb.html src/trunk/doc/files/libs/abtreportmanager_rb.html src/trunk/doc/files/libs/abtsystemmanager_rb.html src/trunk/doc/files/libs/abtusage_rb.html src/trunk/doc/files/tests/testabtdepengine_rb.html src/trunk/doc/files/tests/testabtdownloadmanager_rb.html src/trunk/doc/files/tests/testabtlogmanager_rb.html src/trunk/doc/files/tests/testabtpackage_rb.html src/trunk/doc/files/tests/testabtpackagemanager_rb.html src/trunk/doc/files/tests/testabtqueuemanager_rb.html src/trunk/doc/files/tests/testabtreportmanager_rb.html src/trunk/doc/files/tests/testabtsystemmanager_rb.html src/trunk/doc/fr_class_index.html src/trunk/doc/fr_file_index.html src/trunk/doc/fr_method_index.html src/trunk/docgen.sh src/trunk/libs/abtlogmanager.rb src/trunk/libs/abtpackage.rb src/trunk/libs/abtpackagemanager.rb src/trunk/libs/abtreportmanager.rb src/trunk/new_abt_package.rb src/trunk/packages/bash.rb src/trunk/packages/grep.rb src/trunk/packages/ipc.rb src/trunk/tests/testsuiteabt.rb Added Paths: ----------- src/trunk/doc/classes/Bash.html src/trunk/doc/classes/Binutils.html src/trunk/doc/classes/Checkinstall.html src/trunk/doc/classes/Diffutils.html src/trunk/doc/classes/Findutils.html src/trunk/doc/classes/Fortune.html src/trunk/doc/classes/Grep.html src/trunk/doc/classes/Ipc.html src/trunk/doc/classes/Ncurses.html src/trunk/doc/classes/Sed.html src/trunk/doc/classes/Tar.html src/trunk/doc/classes/Wget.html src/trunk/doc/dot/f_17.dot src/trunk/doc/dot/f_17.png src/trunk/doc/dot/f_18.dot src/trunk/doc/dot/f_18.png src/trunk/doc/dot/f_19.dot src/trunk/doc/dot/f_19.png src/trunk/doc/dot/f_20.dot src/trunk/doc/dot/f_20.png src/trunk/doc/dot/f_21.dot src/trunk/doc/dot/f_21.png src/trunk/doc/dot/f_22.dot src/trunk/doc/dot/f_22.png src/trunk/doc/dot/f_23.dot src/trunk/doc/dot/f_23.png src/trunk/doc/dot/f_24.dot src/trunk/doc/dot/f_24.png src/trunk/doc/dot/f_25.dot src/trunk/doc/dot/f_25.png src/trunk/doc/dot/f_26.dot src/trunk/doc/dot/f_26.png src/trunk/doc/dot/f_27.dot src/trunk/doc/dot/f_27.png src/trunk/doc/dot/f_28.dot src/trunk/doc/dot/f_28.png src/trunk/packages/binutils.rb src/trunk/packages/bzip2.rb src/trunk/packages/cpio.rb src/trunk/packages/diffutils.rb src/trunk/packages/findutils.rb src/trunk/packages/gawk.rb src/trunk/packages/gcc.rb src/trunk/packages/glibc.rb src/trunk/packages/gzip.rb src/trunk/packages/less.rb src/trunk/packages/ncurses.rb src/trunk/packages/sed.rb src/trunk/packages/tar.rb src/trunk/packages/texinfo.rb src/trunk/packages/unzip.rb src/trunk/packages/wget.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2008-02-14 20:37:09 UTC (rev 525) +++ src/trunk/abt.rb 2008-12-04 07:42:59 UTC (rev 526) @@ -39,15 +39,15 @@ } if !($counter > 0) - puts "\n\nUnable to run without installwatch, see package details of checkinstall." - exit + puts "\n\nUnable to run properly without installwatch, see package details of checkinstall." + puts "\nWe can continue but you may experience unexpected results, please install checkinstall asap.\n\n" end # Check and install our library files. # $DEFAULT_PREFIX = "/usr/local" libpath = "#{$DEFAULT_PREFIX}/var/lib/abt" -$ABTLINUX_CLASS_LIBS = "https://abtlinux.svn.sourceforge.net/svnroot/abtlinux/src/trunk/libs" +$ABTLINUX_CLASS_LIBS = "http://svn2.assembla.com/svn/abtlinux/src/trunk/libs" if (! File.directory?(libpath) || Dir[libpath].empty?) puts "\nMissing needed AbTLinux library files..." @@ -73,42 +73,46 @@ # Load our central configuration file. # -$ABTLINUX_MAIN_CONFIG = "https://abtlinux.svn.sourceforge.net/svnroot/abtlinux/src/trunk/abtconfig.rb" +$ABTLINUX_MAIN_CONFIG = "http://svn2.assembla.com/svn/abtlinux/src/trunk/abtconfig.rb" configfile = "#{$DEFAULT_PREFIX}/etc/abt/abtconfig.rb" +myconfig = "#{$DEFAULT_PREFIX}/etc/abt/local/myabtconfig.rb" maxconfigpath = "#{$DEFAULT_PREFIX}/etc/abt/local" if File.exist?(configfile) $LOAD_PATH.unshift "#{$DEFAULT_PREFIX}/etc/abt/" load 'abtconfig.rb' + + # do we need to load a local config file? + if File.exist?(myconfig) + $LOAD_PATH.unshift maxconfigpath + load 'myabtconfig.rb' + end + else - require 'fileutils' # need this here, usually in abtconfig. + # no config file, need to download it. + require 'fileutils' # need this here, usually in abtconfig. # missing configuration file, do some abt update? puts "\nMissing our main configuration file at #{configfile}" puts "\nMaybe time for an abt update? Let us try to fix it for you!\n" - - # check for root login. + + # check for root login. if (Process.uid != 0) - puts "\nMust be root to fix configuration files." - exit - else - if (! File.directory?(maxconfigpath)) - puts "debug: directory to be created: #{maxconfigpath}" - FileUtils.mkdir_p maxconfigpath - puts "Created directory: #{maxconfigpath}" - end - - system("svn export #{$ABTLINUX_MAIN_CONFIG} #{configfile}") - end + puts "\nMust be root to fix configuration files." + exit + else + if (! File.directory?(maxconfigpath)) + puts "debug: directory to be created: #{maxconfigpath}" + FileUtils.mkdir_p maxconfigpath + puts "Created directory: #{maxconfigpath}" + end + + system("svn export #{$ABTLINUX_MAIN_CONFIG} #{configfile}") + end # should be installed, load config. $LOAD_PATH.unshift "#{$DEFAULT_PREFIX}/etc/abt/" load 'abtconfig.rb' - - if File.exist?("#{$DEFAULT_PREFIX}/etc/abt/local/localconfig.rb") - $LOAD_PATH.unshift maxconfigpath - load 'localconfig.rb' - end end @@ -348,10 +352,6 @@ when "show-config" if (ARGV.length == 2) options['package'] = ARGV[1] - if !system.package_installed(options['package']) - puts "\nThe package #{options['package']} is not installed, can't show the configure log." - exit - end puts "\nDisplay configure log for package : #{options['package']}" puts "===============================\n" Modified: src/trunk/abtconfig.rb =================================================================== --- src/trunk/abtconfig.rb 2008-02-14 20:37:09 UTC (rev 525) +++ src/trunk/abtconfig.rb 2008-12-04 07:42:59 UTC (rev 526) @@ -61,7 +61,7 @@ # default config options. # -$ABT_VERSION = "0.2" +$ABT_VERSION = "0.3" $BUILD_ARCH = "-march=pentium2" # i686, pentium II. $BUILD_SIZE = "-Os" # optimize for size. $BUILD_NODEBUG = "-fomit-frame-pointer" # removes debug info. @@ -77,7 +77,7 @@ $TIMESTAMP = Time.now.strftime( "%Y-%m-%d %H:%M:%S (%Z)" ) $PAGER_DEFAULT = "less -R -E -X -f" $LOG_LEVEL = "Logger::DEBUG" -$ABTLINUX_PACKAGES = "https://abtlinux.svn.sourceforge.net/svnroot/abtlinux/src/trunk/packages" +$ABTLINUX_PACKAGES = "https://svn2.assembla.com/svn/abtlinux/src/trunk/packages" # default URL listing. # @@ -88,7 +88,7 @@ $APACHE_URL = "http://www.ibiblio.org/pub/mirrors/apache" $CTAN_URL = "ftp://tug.ctan.org/tex-archive" $GNOME_URL = "ftp://ftp.gnome.org/pub/GNOME" -$GNU_URL = "ftp://ftp.gnu.org/pub/gnu" +$GNU_URL = "http://ftp.gnu.org/gnu" $KDE_URL = "ftp://ftp.kde.org/pub/kde" $KERNEL_URL = "ftp://ftp.kernel.org" $SOURCEFORGE_URL = "http://osdn.dl.sourceforge.net/sourceforge" Modified: src/trunk/doc/classes/AbtDepEngine.html =================================================================== --- src/trunk/doc/classes/AbtDepEngine.html 2008-02-14 20:37:09 UTC (rev 525) +++ src/trunk/doc/classes/AbtDepEngine.html 2008-12-04 07:42:59 UTC (rev 526) @@ -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,125,98" href="AbtDepEngine.html" alt="AbtDepEngine" /> + <area shape="rect" coords="27,52,128,100" 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="#M000106">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="M000106"></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('M000106_source')" id="l_M000106_source">show source</a> ]</p> + <div id="M000106_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File libs/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 2008-02-14 20:37:09 UTC (rev 525) +++ src/trunk/doc/classes/AbtDownloadManager.html 2008-12-04 07:42:59 UTC (rev 526) @@ -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,160,98" href="AbtDownloadManager.html" alt="AbtDownloadManager" /> + <area shape="rect" coords="27,52,165,100" 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="#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> + <li><a href="#M000013">new</a></li> + <li><a href="#M000016">retrieve_news_feed</a></li> + <li><a href="#M000014">retrieve_package_source</a></li> + <li><a href="#M000015">retrieve_package_tree</a></li> + <li><a href="#M000017">update_package</a></li> + <li><a href="#M000018">update_package_tree</a></li> + <li><a href="#M000019">validated</a></li> </ul> @@ -134,7 +134,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000012"></a><b>new</b>() + <a name="M000013"></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('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 libs/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="M000015"></a><b>retrieve_news_feed</b>(uri, cleanLog=true) + <a name="M000016"></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('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 libs/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="M000013"></a><b>retrieve_package_source</b>(packageName, destination) + <a name="M000014"></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('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 libs/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>) @@ -278,7 +278,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000014"></a><b>retrieve_package_tree</b>(packageTreeName="AbTLinux") + <a name="M000015"></a><b>retrieve_package_tree</b>(packageTreeName="AbTLinux") </div> <div class="description"> <p> @@ -294,8 +294,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 libs/abtdownloadmanager.rb, line 84</span> 84: <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="M000016"></a><b>update_package</b>(packageName) + <a name="M000017"></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('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 libs/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="M000017"></a><b>update_package_tree</b>() + <a name="M000018"></a><b>update_package_tree</b>() </div> <div class="description"> <p> @@ -395,8 +395,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 libs/abtdownloadmanager.rb, line 209</span> 209: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_package_tree</span>() @@ -431,7 +431,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000018"></a><b>validated</b>(hashvalue, path) + <a name="M000019"></a><b>validated</b>(hashvalue, path) </div> <div class="description"> <p> @@ -448,8 +448,8 @@ </p> </div> <div class="sourcecode"> - <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"> + <p class="source-link">[ <a href="javascript:toggleSource('M000019_source')" id="l_M000019_source">show source</a> ]</p> + <div id="M000019_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File libs/abtdownloadmanager.rb, line 245</span> 245: <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 2008-02-14 20:37:09 UTC (rev 525) +++ src/trunk/doc/classes/AbtLogManager.html 2008-12-04 07:42:59 UTC (rev 526) @@ -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,131,98" href="AbtLogManager.html" alt="AbtLogManager" /> + <area shape="rect" coords="27,52,136,100" 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,11 +117,11 @@ <div class="sectiontitle">Methods</div> <ul> - <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> + <li><a href="#M000072">get_log</a></li> + <li><a href="#M000076">log_package_build</a></li> + <li><a href="#M000075">log_package_install</a></li> + <li><a href="#M000074">log_package_integrity</a></li> + <li><a href="#M000073">new</a></li> </ul> @@ -132,7 +132,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000065"></a><b>new</b>() + <a name="M000073"></a><b>new</b>() </div> <div class="description"> <p> @@ -145,26 +145,26 @@ </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('M000073_source')" id="l_M000073_source">show source</a> ]</p> + <div id="M000073_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 80</span> -80: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> -81: <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">$JOURNAL</span>)) -82: <span class="ruby-comment cmt"># logging directory missing, create it!</span> -83: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>(<span class="ruby-identifier">$ABT_LOGS</span>) -84: <span class="ruby-keyword kw">end</span> -85: -86: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>) -87: [<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>, <span class="ruby-identifier">$ABT_LIBS</span>, -88: <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> -89: -90: <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>)) -91: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>(<span class="ruby-identifier">dir</span>) -92: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">"Created directory: #{dir}."</span>) -93: <span class="ruby-keyword kw">end</span> -94: } -95: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 117</span> +117: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> +118: <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">$JOURNAL</span>)) +119: <span class="ruby-comment cmt"># logging directory missing, create it!</span> +120: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>(<span class="ruby-identifier">$ABT_LOGS</span>) +121: <span class="ruby-keyword kw">end</span> +122: +123: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>) +124: [<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>, <span class="ruby-identifier">$ABT_LIBS</span>, +125: <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> +126: +127: <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>)) +128: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>(<span class="ruby-identifier">dir</span>) +129: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">"Created directory: #{dir}."</span>) +130: <span class="ruby-keyword kw">end</span> +131: } +132: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -172,7 +172,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000064"></a><b>get_log</b>(package, type) + <a name="M000072"></a><b>get_log</b>(package, type) </div> <div class="description"> <p> @@ -186,46 +186,46 @@ </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('M000072_source')" id="l_M000072_source">show source</a> ]</p> + <div id="M000072_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File libs/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>) -44: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}/#{package}"</span> -45: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>(<span class="ruby-node">"#{package.capitalize}.new"</span>) -46: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> -47: -48: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">type</span> -49: -50: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'install'</span> -51: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.install"</span> -52: -53: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'integrity'</span> -54: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.integrity"</span> -55: -56: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'tmpinstall'</span> -57: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$ABT_TMP}/#{details['Source location']}.watch"</span> -58: -59: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'build'</span> -60: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.build"</span> -61: -62: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'configure'</span> -63: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.configure"</span> -64: -65: <span class="ruby-keyword kw">else</span> -66: <span class="ruby-identifier">log</span> = <span class="ruby-value str">""</span> -67: -68: <span class="ruby-keyword kw">end</span> -69: -70: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">log</span> -71: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 80</span> + 80: <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>) + 81: <span class="ruby-identifier">require</span> <span class="ruby-node">"#{$PACKAGE_PATH}/#{package}"</span> + 82: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>(<span class="ruby-node">"#{package.capitalize}.new"</span>) + 83: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> + 84: + 85: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">type</span> + 86: + 87: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'install'</span> + 88: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.install"</span> + 89: + 90: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'integrity'</span> + 91: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.integrity"</span> + 92: + 93: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'tmpinstall'</span> + 94: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$ABT_TMP}/#{details['Source location']}.watch"</span> + 95: + 96: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'build'</span> + 97: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.build"</span> + 98: + 99: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'configure'</span> +100: <span class="ruby-identifier">log</span> = <span class="ruby-node">"#{$PACKAGE_INSTALLED}/#{details['Source location']}/#{details['Source location']}.configure"</span> +101: +102: <span class="ruby-keyword kw">else</span> +103: <span class="ruby-identifier">log</span> = <span class="ruby-value str">""</span> +104: +105: <span class="ruby-keyword kw">end</span> +106: +107: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">log</span> +108: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000068"></a><b>log_package_build</b>(package) + <a name="M000076"></a><b>log_package_build</b>(package) </div> <div class="description"> <p> @@ -241,27 +241,27 @@ </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('M000076_source')" id="l_M000076_source">show source</a> ]</p> + <div id="M000076_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 192</span> -192: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_build</span>(<span class="ruby-identifier">package</span>) -193: <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>) -194: -195: <span class="ruby-comment cmt"># make sure the build file exists.</span> -196: <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>)) -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> + <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 242</span> +242: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_build</span>(<span class="ruby-identifier">package</span>) +243: <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>) +244: +245: <span class="ruby-comment cmt"># make sure the build file exists.</span> +246: <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>)) +247: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +248: <span class="ruby-keyword kw">end</span> +249: +250: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +251: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000067"></a><b>log_package_install</b>(package) + <a name="M000075"></a><b>log_package_install</b>(package) </div> <div class="description"> <p> @@ -277,55 +277,63 @@ </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('M000075_source')" id="l_M000075_source">show source</a> ]</p> + <div id="M000075_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 144</span> -144: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_install</span>(<span class="ruby-identifier">package</span>) -145: <span class="ruby-comment cmt"># some dirs we will not add to an install log.</span> -146: <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>) -147: <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> -148: -149: <span class="ruby-comment cmt"># our log locations.</span> -150: <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>) -151: <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>) -152: -153: <span class="ruby-comment cmt"># get the installed files from the tmp file</span> -154: <span class="ruby-comment cmt"># into our install log.</span> -155: <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>)) -156: <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>) -157: -158: <span class="ruby-comment cmt"># include only the file names from open calls</span> -159: <span class="ruby-comment cmt"># and not part of the excluded range of directories.</span> -160: <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> -161: <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>) -162: <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>) -163: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">true</span> -164: <span class="ruby-keyword kw">else</span> -165: <span class="ruby-identifier">badLine</span> = <span class="ruby-keyword kw">false</span> -166: <span class="ruby-keyword kw">end</span> -167: -168: <span class="ruby-keyword kw">if</span> (<span class="ruby-operator">!</span><span class="ruby-identifier">badLine</span>) -169: <span class="ruby-identifier">installFile</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{line.split[2]}\n"</span> -170: <span class="ruby-keyword kw">end</span> -171: <span class="ruby-keyword kw">end</span> -172: <span class="ruby-keyword kw">end</span> -173: -174: <span class="ruby-identifier">installFile</span>.<span class="ruby-identifier">close</span> -175: <span class="ruby-keyword kw">else</span> -176: <span class="ruby-comment cmt"># no tmp install file, thus no install running.</span> -177: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -178: <span class="ruby-keyword kw">end</span> -179: -180: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>; -181: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File libs/abtlogmanager.rb, line 186</span> +186: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_package_install</span>(<span class="ruby-identifier">package</span>) +187: <span class="ruby-identifier">renames</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># to hold installwatch identified renames.</span> +188: <span class="ruby-identifier">duplicates</span> = <span class="ruby-constant">Hash</span>.<span class="ruby-identifier">new</span> <span class="ruby-comment cmt"># to hold entries for duplicate checking.</span> +189: +190: <span class="ruby-comment cmt"># some dirs we will not add to an install log.</span> +191: <span class="ruby-identifier">excluded_pattern</span> = <span class="ruby-constant">Regexp</span>.<span class="ruby-identifier">new</span>(<span class="ruby-node">"^(/dev|/proc|/tmp|/var/tmp|/usr/src|/sys|#{$DEFAULT_PREFIX}/usr/src)+"</span>) +192: +193: <span class="ruby-comment cmt"># our log locations.</span> +194: <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>) +195: <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>) +196: +197: <span class="ruby-comment cmt"># get the installed files from the tmp file</span> +198: <span class="ruby-comment cmt"># into our install log.</span> +199: <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>)) +200: <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>) +201: +202: <span class="ruby-comment cmt"># include only the file names from open calls</span> +203: <span class="ruby-comment cmt"># and not part of the excluded range of directories.</span> +204: <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> +205: <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">'rename'</span>) +206: <span class="ruby-comment cmt"># they renamed the line, save this entry for cleaning</span> +207: <span class="ruby-comment cmt"># after install log is closed. Hash key is the original</span> +208: <span class="ruby-comment cmt"># installed file name, Hash value is the new file name.</span> +209: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">renames</span>.<span class="ruby-identifier">has_key?</span>(<span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>])) +210: <span class="ruby-identifier">renames</span>[<span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>]] = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">3</span>] +211: <span class="ruby-keyword kw">end</span> +212: <span class="ruby-keyword kw">elsif</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>) <span class="ruby-keyword kw">and</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>]) +213: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</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>) +214: <span class="ruby-comment cmt"># possible install log addition.</span> +215: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">duplicates</span>.<span class="ruby-identifier">key?</span>(<span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>]) +216: <span class="ruby-comment cmt"># add to duplicate tracking hash and install log.</span> +217: <span class="ruby-identifier">duplicates</span>[<span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>]] = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">split</span>[<span class="ruby-value">2</span>] +218: <span class="ruby-identifier">installFile</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"#{line.split[2]}\n"</span> +219: <span class="ruby-keyword kw">end</span> +220: <span class="ruby-keyword kw">end</span> +221: <span class="ruby-keyword kw">end</span> +222: <span class="ruby-keyword kw">end</span> +223: +224: <span class="ruby-identifier">check_for_file_renames</span>(<span class="ruby-identifier">renames</span>, <span class="ruby-identifier">installLog</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">renames</span>.<span class="ruby-identifier">empty?</span> +225: <span class="ruby-keyword kw">else</span> +226: <span class="ruby-comment cmt"># no tmp install file, thus no install running.</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: +230: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>; +231: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000066"></a><b>log_package_integrity</b>(package) + <a name="M000074"></a><b>log_package_integrity</b>(package) </div> <div class="description"> <p> @@ -342,37 +350,42 @@ </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('M000074_source')" id="l_M000074_source">show source</a> ]</p> + <div id="M000074_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File libs/abtlogmanager.... [truncated message content] |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:33:21
|
#2: Log initial file permissions on install -----------------------+---------------------------------------------------- Reporter: erics | Owner: erics Type: wishlist | Status: closed Priority: minor | Milestone: Component: abt | Version: 0.1 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by erics): * milestone: version_1.x => -- Ticket URL: <http://trac.abtlinux.org/ticket/2#comment:5> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:32:57
|
#13: adding entries for tarball size and size after compilation in packages -------------------------------+-------------------------------------------- Reporter: lo...@ab... | Owner: lo...@ab... Type: wishlist | Status: closed Priority: major | Milestone: Component: packages | Version: 0.1 Resolution: invalid | Keywords: package specs -------------------------------+-------------------------------------------- Changes (by erics): * version: 0.8 => 0.1 * milestone: version_1.x => -- Ticket URL: <http://trac.abtlinux.org/ticket/13#comment:3> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:32:34
|
#9: Add scenarios to requirements - packages ------------------------+--------------------------------------------------- Reporter: erics | Owner: erics Type: wishlist | Status: closed Priority: major | Milestone: Component: depEngine | Version: 0.1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by erics): * version: 0.9 => 0.1 * milestone: version_1.x => -- Ticket URL: <http://trac.abtlinux.org/ticket/9#comment:7> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:31:32
|
#2: Log initial file permissions on install -----------------------+---------------------------------------------------- Reporter: erics | Owner: erics Type: wishlist | Status: closed Priority: minor | Milestone: version_1.x Component: abt | Version: 0.1 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by erics): * version: 0.8 => 0.1 * milestone: version_0.9 => version_1.x -- Ticket URL: <http://trac.abtlinux.org/ticket/2#comment:4> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:31:08
|
#15: Refactor use of LogManager out of code base --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: closed Priority: major | Milestone: Component: abt | Version: 0.1 Resolution: fixed | Keywords: --------------------+------------------------------------------------------- Changes (by erics): * version: 0.8 => 0.1 * milestone: version_0.9 => -- Ticket URL: <http://trac.abtlinux.org/ticket/15#comment:5> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:30:41
|
#12: Complete design document ----------------------------+----------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: closed Priority: major | Milestone: Component: abtlinux-docs | Version: 0.1 Resolution: fixed | Keywords: ----------------------------+----------------------------------------------- Changes (by erics): * version: 0.8 => 0.1 * milestone: version_0.9 => -- Ticket URL: <http://trac.abtlinux.org/ticket/12#comment:2> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:30:23
|
#8: Add scenarios to requirements - packages ----------------------------+----------------------------------------------- Reporter: erics | Owner: erics Type: wishlist | Status: closed Priority: major | Milestone: Component: abtlinux-docs | Version: 0.1 Resolution: fixed | Keywords: ----------------------------+----------------------------------------------- Changes (by erics): * version: 0.6 => 0.1 * milestone: version_0.6 => -- Ticket URL: <http://trac.abtlinux.org/ticket/8#comment:5> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:29:43
|
#10: Define abt API ----------------------------+----------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: closed Priority: major | Milestone: Component: abtlinux-docs | Version: 0.1 Resolution: fixed | Keywords: ----------------------------+----------------------------------------------- Changes (by erics): * version: 0.7 => 0.1 * milestone: version_0.8 => -- Ticket URL: <http://trac.abtlinux.org/ticket/10#comment:3> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:29:25
|
#11: define package format and methods. ------------------------+--------------------------------------------------- Reporter: low | Owner: low Type: wishlist | Status: closed Priority: critical | Milestone: Component: depEngine | Version: 0.1 Resolution: fixed | Keywords: package file format methods ------------------------+--------------------------------------------------- Changes (by erics): * version: 0.8 => 0.1 * milestone: version_0.9 => -- Ticket URL: <http://trac.abtlinux.org/ticket/11#comment:3> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:27:16
|
#17: Package creation, complete 10 packages from the supported package list. --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: assigned Priority: major | Milestone: version_0.3 Component: abt | Version: 0.2 Resolution: | Keywords: --------------------+------------------------------------------------------- Changes (by erics): * version: 0.1 => 0.2 * milestone: version_0.2 => version_0.3 -- Ticket URL: <http://trac.abtlinux.org/ticket/17#comment:3> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:27:02
|
#16: Allow override configs via abtconfig.local file --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: assigned Priority: major | Milestone: version_0.3 Component: abt | Version: 0.2 Resolution: | Keywords: --------------------+------------------------------------------------------- Changes (by erics): * version: 0.1 => 0.2 * milestone: version_0.2 => version_0.3 -- Ticket URL: <http://trac.abtlinux.org/ticket/16#comment:2> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:21:16
|
#13: adding entries for tarball size and size after compilation in packages -------------------------------+-------------------------------------------- Reporter: lo...@ab... | Owner: lo...@ab... Type: wishlist | Status: closed Priority: major | Milestone: version_1.x Component: packages | Version: 0.8 Resolution: invalid | Keywords: package specs -------------------------------+-------------------------------------------- Changes (by erics): * status: new => closed * resolution: => invalid -- Ticket URL: <http://trac.abtlinux.org/ticket/13#comment:2> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:15:28
|
#16: Allow override configs via abtconfig.local file --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: assigned Priority: major | Milestone: version_0.2 Component: abt | Version: 0.1 Resolution: | Keywords: --------------------+------------------------------------------------------- Changes (by erics): * status: new => assigned * type: defect => task -- Ticket URL: <http://trac.abtlinux.org/ticket/16#comment:1> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:15:28
|
#17: Package creation, complete 10 packages from the supported package list. --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: task | Status: assigned Priority: major | Milestone: version_0.2 Component: abt | Version: 0.1 Resolution: | Keywords: --------------------+------------------------------------------------------- Changes (by erics): * status: new => assigned -- Ticket URL: <http://trac.abtlinux.org/ticket/17#comment:2> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |
From: ABout T. L. <esc...@us...> - 2008-03-30 09:15:28
|
#17: Package creation, complete 10 packages from the supported package list. --------------------+------------------------------------------------------- Reporter: erics | Owner: erics Type: defect | Status: new Priority: major | Milestone: version_0.2 Component: abt | Version: 0.1 Keywords: | --------------------+------------------------------------------------------- see http://abtlinux.wiki.sourceforge.net/Supported+packages for the listing. -- Ticket URL: <http://trac.abtlinux.org/ticket/17> ABout Time Linux <http://www.abtlinux.org> It's about time someone did it right... |