autoproj 1.8.2.b15 → 1.8.2.b16

data/bin/autoproj_bootstrap

@@ -295,19 +295,27 @@ fi
             end
 
             def filter_uptodate_packages(packages)
-                result = `LANG=C rpm -q '#{packages.join("' '")}'`
-                if $?.exitstatus != 0
-                    Autoproj.warn "cannot run rpm -q #{packages.join(", ")}. I am assuming that no packages are already installed"
-                    return packages
-                else
-                    result = []
-                    result.split("\n").each_with_index do |line, index|
-                        if line =~ /is not installed/
-                            result << packages[index]
-                        end
+                result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
+
+                installed_packages = []
+		new_packages = []
+                result.split("\n").each_with_index do |line, index|
+		    line = line.strip
+                    if line =~ /package (.*) is not installed/
+			package_name = $1
+			if !packages.include?(package_name) # something is wrong, fallback to installing everything
+			    return packages
+			end
+                        new_packages << package_name
+		    else 
+			package_name = line.strip
+			if !packages.include?(package_name) # something is wrong, fallback to installing everything
+			    return packages
+			end
+		        installed_packages << package_name
                     end
-                    result
                 end
+                new_packages
             end
         end
 
@@ -1792,6 +1800,11 @@ ruby18:
   gentoo:
   - dev-lang/ruby:1.8
   - rake
+  fedora:
+    '15,16':
+    - ruby
+    - rubygems
+    default: nonexistent
 ruby19:
   debian:
   - ruby1.9.1
@@ -1812,12 +1825,16 @@ ruby19:
   arch:
   - ruby
   - rake
+  fedora:
+    '17':
+    - ruby
+    - rubygems
+    default: nonexistent
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
   arch: ignore
-zlib:
-  debian,ubuntu: zlib1g-dev
+  fedora: ignore
 autobuild: gem
 autoproj: gem
 git:
@@ -1827,14 +1844,17 @@ git:
   ubuntu: git-core
   gentoo: dev-vcs/git
   arch: git
+  fedora: git
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
   arch: subversion
+  fedora: subversion
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
   arch: cmake
+  fedora: cmake
 autotools:
   debian,ubuntu:
   - automake1.9
@@ -1843,10 +1863,14 @@ autotools:
   - sys-devel/automake:1.9
   - sys-devel/autoconf
   arch: automake autoconf
+  fedora:
+  - automake
+  - autoconf
 lsb_release:
   debian,ubuntu: lsb-release
   gentoo: sys-apps/lsb-release
   arch: ignore
+  fedora: redhat-lsb
 archive:
   debian,ubuntu:
   - tar
@@ -1857,8 +1881,12 @@ archive:
   arch:
   - tar
   - unzip
+  fedora:
+  - tar
+  - unzip
 cvs:
   debian,ubuntu: cvs
+  fedora: cvs
 
 EODEFS
 

data/lib/autoproj/default.osdeps

@@ -12,7 +12,11 @@ ruby18:
     gentoo:
         - dev-lang/ruby:1.8
         - rake
-
+    fedora:
+      "15,16":
+        - ruby
+        - rubygems
+      default: nonexistent
 ruby19:
     debian:
         - ruby1.9.1
@@ -34,54 +38,74 @@ ruby19:
     arch:
         - ruby
         - rake
+    fedora:
+      "17":
+      - ruby
+      - rubygems
+      default: nonexistent
 
 build-essential:
-    debian,ubuntu: build-essential
-    gentoo: ignore
-    arch: ignore
-
-zlib:
-    debian,ubuntu: zlib1g-dev
-
+  debian,ubuntu: build-essential
+  gentoo: ignore
+  arch: ignore
+  fedora: ignore
 
 autobuild: gem
 autoproj: gem
 
 # The following definitions are for the VCS and build systems
 git:
-    debian:
-        lenny:
-            git
-        default: git-core
-    ubuntu: git-core
-    gentoo: dev-vcs/git
-    arch: git
+  debian:
+    lenny: git
+    default: git-core
+  ubuntu: git-core
+  gentoo: dev-vcs/git
+  arch: git
+  fedora: git
 svn:
-    debian,ubuntu: subversion
-    gentoo: dev-util/subversion
-    arch: subversion
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
+  fedora: subversion
 cmake:
-    debian,ubuntu: cmake
-    gentoo: dev-util/cmake
-    arch: cmake
-
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+  arch: cmake
+  fedora: cmake
 autotools:
-    debian,ubuntu: ["automake1.9", autoconf]
-    gentoo: ["sys-devel/automake:1.9", sys-devel/autoconf]
-    arch: automake autoconf
+  debian,ubuntu:
+  - "automake1.9"
+  - autoconf
+  gentoo:
+  - "sys-devel/automake:1.9"
+  - sys-devel/autoconf
+  arch: automake autoconf
+  fedora:
+  - automake
+  - autoconf
 
 lsb_release:
-    debian,ubuntu: lsb-release
-    gentoo: sys-apps/lsb-release
-    arch: ignore
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+  arch: ignore
+  fedora: redhat-lsb
     
 archive:
-    debian,ubuntu: [tar, unzip]
-    gentoo: [app-arch/tar, app-arch/unzip]
-    arch: [tar, unzip]
-
+  debian,ubuntu:
+  - tar
+  - unzip
+  gentoo:
+  - app-arch/tar
+  - app-arch/unzip
+  arch:
+  - tar
+  - unzip
+  fedora:
+  - tar
+  - unzip
 cvs:
-    debian,ubuntu: cvs
+  debian,ubuntu: cvs
+  fedora: cvs
 
 # vim: expandtab
 

data/lib/autoproj/osdeps.rb

@@ -196,19 +196,27 @@ fi
             end
 
             def filter_uptodate_packages(packages)
-                result = `LANG=C rpm -q '#{packages.join("' '")}'`
-                if $?.exitstatus != 0
-                    Autoproj.warn "cannot run rpm -q #{packages.join(", ")}. I am assuming that no packages are already installed"
-                    return packages
-                else
-                    result = []
-                    result.split("\n").each_with_index do |line, index|
-                        if line =~ /is not installed/
-                            result << packages[index]
-                        end
+                result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
+
+                installed_packages = []
+		new_packages = []
+                result.split("\n").each_with_index do |line, index|
+		    line = line.strip
+                    if line =~ /package (.*) is not installed/
+			package_name = $1
+			if !packages.include?(package_name) # something is wrong, fallback to installing everything
+			    return packages
+			end
+                        new_packages << package_name
+		    else 
+			package_name = line.strip
+			if !packages.include?(package_name) # something is wrong, fallback to installing everything
+			    return packages
+			end
+		        installed_packages << package_name
                     end
-                    result
                 end
+                new_packages
             end
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b15"
+    VERSION = "1.8.2.b16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b15
+  version: 1.8.2.b16
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &9121940 !ruby/object:Gem::Requirement
+  requirement: &17073020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *9121940
+  version_requirements: *17073020
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &9120560 !ruby/object:Gem::Requirement
+  requirement: &17072460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *9120560
+  version_requirements: *17072460
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &9119700 !ruby/object:Gem::Requirement
+  requirement: &17071900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *9119700
+  version_requirements: *17071900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9118900 !ruby/object:Gem::Requirement
+  requirement: &17071040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *9118900
+  version_requirements: *17071040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9118180 !ruby/object:Gem::Requirement
+  requirement: &17069660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *9118180
+  version_requirements: *17069660
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.