mccun934

diff --git a/cli/src/katello/client/core/template.py b/cli/src/katello/client/core/template.py
index 38d811e..8c28837 100644
--- a/cli/src/katello/client/core/template.py
+++ b/cli/src/katello/client/core/template.py
@@ -337,8 +337,8 @@ class Update(TemplateAction):
         #self.parser.add_option('--add_product', dest='add_products', action="append", help=_("name of the product"))
         #self.parser.add_option('--remove_product', dest='remove_products', action="append", help=_("name of the product"))
 
-        self.parser.add_option('--add_package', dest='add_packages', action="append", help=_("name or nvre of the product (epoch:name-rel.ease-ver.sio.n)"))
-        self.parser.add_option('--remove_package', dest='remove_packages', action="append", help=_("name or nvre of the product (epoch:name-rel.ease-ver.sio.n)"))

mccun934

 '[' -d branding ']'
+ echo Compiling SASS files...
Compiling SASS files...
+ compass compile
directory public/stylesheets/compiled/ 
directory public/stylesheets/compiled/widgets/ 
directory public/stylesheets/compiled/sections/ 
    error app/stylesheets/sections/systems.scss (Line 3: File to import not found or unreadable: converge-ui/vars.
Load paths:
  /tmp/tito/rpmbuild-katello-c644566d635e5717d3d87b56354d5bb70cddf635xOFJ17/BUILD/katello-git-270.c644566/app/stylesheets

mccun934

Jul 26, 2012 4:17:55 PM org.apache.coyote.http11.Http11Protocol pause
INFO: Pausing Coyote HTTP/1.1 on http-8080
Jul 26, 2012 4:17:55 PM org.apache.coyote.http11.Http11Protocol pause
INFO: Pausing Coyote HTTP/1.1 on http-8443
Jul 26, 2012 4:17:56 PM org.apache.catalina.core.StandardService stop
INFO: Stopping service Catalina
Jul 26, 2012 4:17:56 PM org.apache.coyote.http11.Http11Protocol destroy
INFO: Stopping Coyote HTTP/1.1 on http-8080
Jul 26, 2012 4:17:56 PM org.apache.coyote.http11.Http11Protocol destroy
INFO: Stopping Coyote HTTP/1.1 on http-8443

mccun934

diff --git a/src/app/models/deletion_changeset.rb b/src/app/models/deletion_changeset.rb
index 3d947e7..7820c93 100644
--- a/src/app/models/deletion_changeset.rb
+++ b/src/app/models/deletion_changeset.rb
@@ -14,7 +14,7 @@
 
 class DeletionChangeset < Changeset
   use_index_of Changeset
-  def delete_from_env(options = { })
+  def apply(options = { })

mccun934

ActiveRecord::RecordInvalid
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/validations.rb:49:in `save!'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/attribute_methods/dirty.rb:30:in `save!'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/transactions.rb:245:in `save!'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/transactions.rb:292:in `with_transaction_returning_status'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/connection_adapters/abstract/database_statements.rb:139:in `transaction'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/transactions.rb:207:in `transaction'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/transactions.rb:290:in `with_transaction_returning_status'
/usr/lib/ruby/gems/1.8/gems/activerecord-3.0.10/lib/active_record/transactions.rb:245:in `save!'
/home/mmccune/devel/katello/src/app/models/deletion_changeset.rb:34:in `apply'

mccun934

(rdb:1) eval @changeset.environment
#<KTEnvironment id: 2, name: "DEV", description: nil, library: false, organization_id: 1, created_at: "2012-07-27 21:24:41", updated_at: "2012-07-27 21:24:41">
(rdb:1) eval @changeset.environment.to_json
"{\"prior\":\"Library\",\"name\":\"DEV\",\"library\":false,\"organization\":\"ACME_Corporation\",\"organization_id\":1,\"prior_id\":1,\"id\":2,\"created_at\":\"2012-07-27T21:24:41Z\",\"updated_at\":\"2012-07-27T21:24:41Z\",\"description\":null}"
(rdb:1) eval @changeset.to_json
NoMethodError Exception: protected method `to_json' called for #<DeletionChangeset:0x7faa7f60a488>
(rdb:1) 

mccun934

# katello --username admin --password admin ping
--------------------------------------------------------------------------------------------------------------------------------------------------------------
                                                                       Katello Status

 Status   Service          Result   Duration   Message  
--------------------------------------------------------------------------------------------------------------------------------------------------------------
 ok                                                     
          candlepin        ok       35ms                
          candlepin_auth   ok       33ms                
          elasticsearch    ok       74ms                

mccun934

# grinder yum --url=http://mirror.centos.org/centos/6/os/x86_64/ --label=grinder-test
grinder.RepoFetch: INFO     fetchYumRepo() repo_label = grinder-test, repo_url = http://mirror.centos.org/centos/6/os/x86_64/, basepath = ./, verify_options = {}
grinder.RepoFetch: INFO     grinder-test, http://mirror.centos.org/centos/6/os/x86_64/, Calling RepoFetch with: cacert=<None>, clicert=<None>, clikey=<None>, proxy_url=<None>, proxy_port=<3128>, proxy_user=<None>, proxy_pass=<NOT_LOGGED>, sslverify=<1>, max_speed=<None>, verify_options=<{}>, filter=<None>
grinder.YumInfo: INFO     6346 packages have been marked to be fetched
grinder.DistroInfo: INFO     Checking if distribution info exists in repository: http://mirror.centos.org/centos/6/os/x86_64/
grinder.DistroInfo: INFO     Tree info fetched from http://mirror.centos.org/centos/6/os/x86_64//.treeinfo
grinder.DistroInfo: INFO     Preparing to fetch any available distribution trees..
grinder.DistroInfo: INFO     4 Tree files have been marked to be fetched
grinder.P

mccun934

[mmccune@kona upstream-katello{master}]$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   src/vendor/converge-ui (new commits)

mccun934

  def set_org
    orgs = current_user.allowed_organizations
    org = Organization.find(params[:org_id])
    if org.nil? or !orgs.include?(org)
      notify.error _("Invalid organization")
      render :nothing => true
      return
    else
      self.current_organization = org
    end