vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-05 22:08:27 +00:00
Code Issues Projects Releases Wiki Activity

Remove -dry-run flag for aptly snapshot filter, as it is useless. #82

Browse Source
This commit is contained in:
Andrey Smirnov
2014-09-22 01:54:35 +04:00
parent 144ccbf809
commit 9c92b81706
5 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/snapshot_filter.go
View File

@@ -70,20 +70,17 @@ func aptlySnapshotFilter(cmd *commander.Command, args []string) error {
return fmt.Errorf("unable to filter: %s", err) return fmt.Errorf("unable to filter: %s", err)
} }
if context.flags.Lookup("dry-run").Value.Get().(bool) { // Create <destination> snapshot
context.Progress().Printf("\nNot creating snapshot, as dry run was requested.\n") destination := deb.NewSnapshotFromPackageList(args[1], []*deb.Snapshot{source}, result,
} else { fmt.Sprintf("Filtered '%s', query was: '%s'", source.Name, strings.Join(args[2:], " ")))
// Create <destination> snapshot
destination := deb.NewSnapshotFromPackageList(args[1], []*deb.Snapshot{source}, result,
fmt.Sprintf("Filtered '%s', query was: '%s'", source.Name, strings.Join(args[2:], " ")))
err = context.CollectionFactory().SnapshotCollection().Add(destination) err = context.CollectionFactory().SnapshotCollection().Add(destination)
if err != nil { if err != nil {
return fmt.Errorf("unable to create snapshot: %s", err) return fmt.Errorf("unable to create snapshot: %s", err)
}
context.Progress().Printf("\nSnapshot %s successfully filtered.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
} }
context.Progress().Printf("\nSnapshot %s successfully filtered.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
return err return err
} }
@@ -104,7 +101,6 @@ Example:
Flag: *flag.NewFlagSet("aptly-snapshot-filter", flag.ExitOnError), Flag: *flag.NewFlagSet("aptly-snapshot-filter", flag.ExitOnError),
} }
cmd.Flag.Bool("dry-run", false, "don't create destination snapshot, just show what would be pulled")
cmd.Flag.Bool("with-deps", false, "include dependent packages as well") cmd.Flag.Bool("with-deps", false, "include dependent packages as well")
return cmd return cmd

4
man/aptly.1
View File

@@ -984,10 +984,6 @@ $ aptly snapshot filter wheezy\-main wheezy\-required \(cqPriorioty (required)\(
Options: Options:
. .
.TP .TP
\-\fBdry\-run\fR=false
don\(cqt create destination snapshot, just show what would be pulled
.
.TP
\-\fBwith\-deps\fR=false \-\fBwith\-deps\fR=false
include dependent packages as well include dependent packages as well
. .

4
system/t05_snapshot/FilterSnapshot4Test_gold
View File

@@ -1,4 +0,0 @@
Loading packages (4742)...
Building indexes...
Not creating snapshot, as dry run was requested.

4
system/t05_snapshot/FilterSnapshot4Test_snapshot_list
View File

@@ -1,4 +0,0 @@
List of snapshots:
* [snap1]: Snapshot from mirror [wheezy-backports]: http://mirror.yandex.ru/debian/ wheezy-backports
To get more information about snapshot, run `aptly snapshot show <name>`.

15
system/t05_snapshot/filter.py
View File

@@ -56,21 +56,6 @@ class FilterSnapshot3Test(BaseTest):
self.check_cmd_output("aptly snapshot show -with-packages snap2", "snapshot_show", match_prepare=remove_created_at) self.check_cmd_output("aptly snapshot show -with-packages snap2", "snapshot_show", match_prepare=remove_created_at)
class FilterSnapshot4Test(BaseTest):
"""
filter snapshot: dry-run
"""
fixtureDB = True
fixtureCmds = [
"aptly snapshot create snap1 from mirror wheezy-backports",
]
runCmd = "aptly snapshot filter -dry-run snap1 snap2 'rsyslog (>= 7.4.4)'"
def check(self):
self.check_output()
self.check_cmd_output("aptly snapshot list", "snapshot_list")
class FilterSnapshot5Test(BaseTest): class FilterSnapshot5Test(BaseTest):
""" """
filter snapshot: no such snapshot filter snapshot: no such snapshot